Commit 3197ca54e44f2c428ac7a326cc87e2b98cbf9829

nelisky 2012-03-18T22:35:10

Better cleanup and error handling