Fix for #23.

Prevent NPE.