Added null default value handling