Adding explicit returns in response to errors

Funny, on Ubuntu (as opposed to OS X) I'm getting

	function ends without a return statement