added exception to not loop if options is not present