Make sure that it's okay to detroy a null object (#7)

Make sure that it's okay to detroy a null object (#7) #24