can you add safety checks against `null` or empty strings, plz?