Bug 940468 - Fix crashes caused by new code. missing return statement