Fix functions with non-void return type that have missing return statement

Fix functions with non-void return type that have missing return statement #1274