Updated to not handle 404s