Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937.

Oops. Not much of a short-circuit without the return, is it?