Fix possible NPE on first start with JSON storage