Fix the missing return statements in the handlers