Added this, and also bumped up the validation a bit to never let it be an invalid string