Raise exception with proper option name.

Change-Id: I494d905cd91da3b79bcf4c9c8a343166b37a1ecf
Fixes: rhbz#916605
Merge "Raise exception with proper option name."