Minor pep8 and extra catch all exception