FIX: previous commit for issue #461 was missing the reported crash fix.