Two return code consistency fix.