added the exception back in