NullPointerException on cold boot fixed