Fix #23 Fix #24 Fix #25
Merge branch 'null-fixes'