Bug Fix: Don't attempt to access a deleted object