More consistent use of maybeFatal in cbfsclient