Fixing present validation with empty string checking