Added options conditions checking to the handlers themselves