Fix bug: remove stop of non-existant handle