- move some things out of the try/except block that aren't getting
  protected by the try
- reduce the amount of code in some helper functions