Adjusting option checker and ignore ret code logic