Moved things into groovy from java so they get done well
Using the nifty multi-catch to remove duplicate lines
Cover those failure paths real quick
Merge pull request #998 from rackerlabs/sonar-dkowis

Sonar dkowis