Added slightly more graceful errors to registration
Added slightly more graceful errors to login
Bug hunting User.java
Merge remote-tracking branch 'origin/BugSearch'