Fix a NPE caused by not checking to see if we're simply being restarted.