Catch more specific NotFoundException subtypes (fixes #24)