A method for collecting diagnostic information associated with an error is disclosed. In one embodiment, such a method includes detecting an error at one of a storage system and a host system coupled to the storage system. In response, the host system gathers software-related diagnostic information related to the error and sends the software-related diagnostic information to the storage system. Meanwhile, the storage system gathers hardware-related diagnostic information related to the error. Once the storage system obtains both software-related diagnostic information and hardware-related diagnostic information, the storage system bundles the information together and sends it to a service provider using a “call home” function. A corresponding system and computer program product are also disclosed.