Added features to help with crashing.