add safe get data, fix oitc stuff #210

Closed ahuyn closed 2 years ago