Fixed missing return (Windows build issue).
Merge branch 'more_fixes'

* more_fixes:
  Fixed missing return (Windows build issue).