XX-10972 Returning 404 if no resource matches