fix some "codepath without return" warnings