(Hopefully) Fixes NULL Errors

This change should work just fine, but you really should test it before
using it in competition.