I'm inclined to leave this as it is - it's coping gracefully with garbage input.  We can revisit if this proves to be causing problems for users.