fix SI-939, null cluster properties

RB=208652
R=osumampo,dhoa,si-dev
A=dhoa