Fixed some merge issues from the pep8 patch

this adds back in a missing exception
and fixes some string spacing.

Change-Id: I9923fd2829a34046d4dffa7b83ed2dfb722fc126