fixes bug 910304 where we see warnings that these functions do not always return a value.
Merge pull request #1235 from canuckistani/bug_910304_func_return_values

Fixes Bug 910304 where we see warnings that these functions do not always return a value. r=@gozala