Merge "Fix NPE while reading leftover journals in BMS"