Fix (hopefully) for rare crash reported in Developer Console.