Moved getUser logic into user handler
Added a final return statement to all callbacks