Improved exception handling.  Filled out UserController