Removed bad exception handling