Improve response status handling;
add NonNull checks