Add debug info in faults