Sorry, cant fix that.
My advice is to save often (each in-game day at least), in the main city map, and to use rollback wisely. My mod (see signature) prohibits rollback to skip over location or important game state changes, but I am not sure if it will always help. The game is even a bit sticky when saving in the middle of dialogs.
If you must use rollback, it might be better to load an earlier save instead. You could try things out using rollback and load the save afterwards, then continue as you found to be the best.