A couple minor fixes and cleanups

There were more, but I was too slow, and other people already fixed them :)
Fix indentation
Re-throw fatal exception
Semicolon!
Merge pull request #198 from aarondav/fixes-local

A couple minor fixes and cleanups