Issue #68: Fix additional chance for NPE.

Fix one more are where the NPE could crop up.