New Exception handling
Remove unused code
Add User reference
Call save method inside try-catch block
Merge branch 'master' into user-details