Moved catch block for NoSuchUserException up to switch statement.