Added guard for options