Added error handling on proxy resource