Fix #320.  Avoid NullPointerException.