Catch NotFound error in resource_proxy
Add tests for non-existent resource
[#1684] Wrap error message in _
import _
Merge branch 'resource-proxy-404'