Improve existence check in callback.
Merge pull request #60 from leftclickben/master

Improve existence check in callback.