Added some paranoid crash checking log messages and fixed some potential
crashes
Merge branch 'fennel-0.1' into katina-0.1
Merge branch 'katina-0.1' into katina-0.2