Better input protection