Fixed NPE occurring on loading old builds.