Prevent NPE. Closes #2