Follow-up to issue #1868980 by Amitaibu: Fixed WSOD.