Issue 125 - Fixed NPE