Added option argument checking ...