Add explicit `return null;` statements