Fixing NPE: Issue #2