Return 404 instead of null if a non-existent CP is queried.