Formatting
Debug the NPE we're seeing in 0.3.1