Deleting NULL is safe

Change-Id: I673fd307d3f5f8c5c27b5dd6968775f81c0af8a0