Moved empty-string check into custom nullable logic