Adding check that CL options are filled in