improved error handling for metadata creation
improved error handling for metadata creation

resource-watch/resource-watch,resource-watch/resource-watch,resource-watch/resource-watch,resource-watch/resource-watch