Fixed all places where non-required value is being treated as if it's required