We shouldn't have this.

Revert "Avoid NRE"

This reverts commit 8922135aa791f1f7e9ec0ef40b885f62f3eb7bba.
Fixing the journal location for restore after journal cleanup