Fix for issue #1800

This includes bot the help fix for #1800 and the null ref fix for #1799