adjusted exception raises - closes #2

hmmm... sorry for all the style changes. my autopep8 fiddles around files. Will get them reverted if you'd like.

Line 95 and 100 are what's importnat in this pr.