Fix null on startup
Merge