Pull req: #1613 sending 404 not found if resource is not found