add error handling to api read query implementations, for not found exceptions
Merge branch '2.0-maint' into 2.1-maint