Add more diagnostic info.