simpler api exceptions
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from modethirteen/master

simpler api exceptions