Provide better error message when discovery connect fails

Change-Id: I67e69793cdc51b00887451f3d9d37b0b2c128084