removed exceptions
cut down to two handlers for all endpoints?