Added extra sanity checks for options.