Better error reporting in the wrapper scripts

Change-Id: Iac82d7a6bc2073ae0f185a869c5e59f4baae4067