GUI-554: Restore generic context-based BotoServerError handler.  Minor PEP8 cleanup