Bug-fix in case enumerized value should be nil.