Fixes #77 - Prevent NPE