DF Added null check to set scale.