CONN-231: fix for null org id when commiting first time.