Made the verify endpoint more general
Removed forced exception