Merge "Fix NPE from refactoring"