Urlencoder now handles nulls