Removing uneeded debug output
making some catches give more useful output