- And handle the null case in the constructor itself. Closes #1794 (again)