Fix NPE at startup
Fix memory leak?!