Adding more error message that can come from puppet

Change-Id: If0a34805c40549b7c16ba28896f522e44d059f37
Merge "Adding more error message that can come from puppet"