Added support for null and empty string in default values