return code fix, some error forgivness