Fix NPE with Sandbox reset