Fix troubelshooting exceptions