Merge "Correct error handling for exceptions in 'user' module"