[c2483] Fix failed assertions while playing with the Mac client. (z2444)