Add missing return statements on error callbacks