Improved bad exit code error message

Change-Id: I3b99c804e95ad3f54edde7de2beb809bfbfc3bea