Let's try everything we can to avoid a potential WSOD situation
Merge pull request #45 from Chassis/WSOD

Avoid the White Screen Of Death (WSOD)