Stricter, more useful checks for defaulted options