Improve message on error by using user provided ID to identify data

Improve message on error by using user provided ID to identify data