Fix: (from Andrus Viik) None return crash.