Add better error reporting for missing argument value

Change-Id: I502dd0d813184374afc76a70ee1134dda466a766