Fixes (Konrad review #3); pep8, exceptions