Switching to more specific exceptions
Stylistic fixes
Merge pull request #19 from rackerlabs/JoshNang/specific-exceptions

Switching to more specific exceptions