More null fixes
Merge branch 'master' of https://github.com/salient-systems/progress-workbook
Merge branch 'master' of https://github.com/salient-systems/progress-workbook