Removed some possible NRE (#101)

Commit

2 years ago

Removed some possible NRE (#101) Co-authored-by: Etienne Baudoux <etbaudou@microsoft.com>