Added error handles, like love handles, but so much more painful to look at