Fixed NPE on startup after refactoring use of 'this' keyword
Updated version