Fixes two compiler warnings regarding missing return statements in non-void functions, reviewed by @danielmewes
Merge branch 'vexocide/2631' into next