[PATCH 17/25] Bugfix: add missing return statements