fix warning reg. no return statement in function returning non-void
Merge pull request #1482 from Jojo-Schmitz/warnings

fix warning reg. no return statement in function returning non-void