Addresses crashes seen on clustered systems


