Fix Thread exception in persistence wizard