Fix a NRE
Merge branch 'hotfix_0.3.1'