Fixes the cause of a null pointer dereference on oom described in ticket #2724.
Attach a file by drag & drop or click to upload
