Added existence check before dropping