Take advantage of delete not acting on null values

Nebula.h and User.h

(cherry picked from commit 1abee8aafcfeda0e4edcac6fcedfbda99e49d982)