diff --git a/click/exceptions.py b/click/exceptions.py
index 6f7a536e26..b48adfd9f7 100644
--- a/click/exceptions.py
+++ b/click/exceptions.py
@@ -115,19 +115,22 @@ def __init__(self, message=None, ctx=None, param=None,
         self.param_type = param_type
 
     def format_message(self):
+        param_type = self.param_type
+        if param_type is None and self.param is not None:
+            param_type = self.param.param_type_name
+
         if self.param_hint is not None:
             param_hint = self.param_hint
         elif self.param is not None:
-            param_hint = self.param.opts or [self.param.human_readable_name]
+            if param_type == 'argument' and self.param.metavar:
+                param_hint = [self.param.metavar]
+            else:
+                param_hint = self.param.opts or [self.param.human_readable_name]
         else:
             param_hint = None
         if isinstance(param_hint, (tuple, list)):
             param_hint = ' / '.join('"%s"' % x for x in param_hint)
 
-        param_type = self.param_type
-        if param_type is None and self.param is not None:
-            param_type = self.param.param_type_name
-
         msg = self.message
         if self.param is not None:
             msg_extra = self.param.type.get_missing_message(self.param)
diff --git a/tests/test_formatting.py b/tests/test_formatting.py
index 4c1c491311..64ba3a4c02 100644
--- a/tests/test_formatting.py
+++ b/tests/test_formatting.py
@@ -163,6 +163,22 @@ def cmd(arg):
     ]
 
 
+def test_formatting_usage_error_metavar(runner):
+    @click.command()
+    @click.argument('arg', metavar='metavar')
+    def cmd(arg):
+        click.echo('arg:' + arg)
+
+    result = runner.invoke(cmd, [])
+    assert result.exit_code == 2
+    assert result.output.splitlines() == [
+        'Usage: cmd [OPTIONS] metavar',
+        'Try "cmd --help" for help.',
+        '',
+        'Error: Missing argument "metavar".'
+    ]
+
+
 def test_formatting_usage_error_nested(runner):
     @click.group()
     def cmd():