fix another segfault
fix crashes
these fields need to be able to be nul
Merge branch 'master' into iconnor