updated stuff in UserController

-removed some testing stuff
-added some null checking stuff