Fixing NullRef spam