Don't attempt to clean up static members during an update.
Fix an NPE reported in ticket-38.