added conditional for un-set property
added conditional for un-set property