Corrected clause to check that mandatory options are set.