Fixing a bug with null response on status