[#2212] CID25977:

checked return value for error status
[#2212] CID25943:

checked return value for error
[#858] don't error on non-error error codes