Hopefully fixes ISSUE #125: Trying to remove a command crashes