Improve error handling for conf sample generation

Prevent check_uptodate.sh script to show invalid diff when sample
config can not be generated.

Change-Id: If5739e1cfeee409947fb6bf8d3bcb515426fe764
Merge "Improve error handling for conf sample generation"