Merge "Handle NPE in UserController"