put the exception handling back in