Fix another NullPointerException with rollbacks