Nil Class error fixed in Common Data Format