Remove bad exception handling where all exceptions are being caught