Build 87.3: Prevent problems caused by deleted sessions