OtherStructure NULL exception fix