Clean up error handling

Created by  Eelco Dolstra  on October 3, 2013
AGQ2MGFEJPFHSV2HPEQLRSTGHIQBMSHS5YWBPQ5PBPGHJ2VRQ5JQC
Change contents