Added additional diagnostic information.