Fixed uncaught exception during removal of non-existent message