diff --git a/cliconfig/config.go b/cliconfig/config.go
index f5b2be8a40..f0adfbf411 100644
--- a/cliconfig/config.go
+++ b/cliconfig/config.go
@@ -17,6 +17,7 @@ import (
 const (
 	// ConfigFileName is the name of config file
 	ConfigFileName = "config.json"
+	configFileDir  = ".docker"
 	oldConfigfile  = ".dockercfg"
 
 	// This constant is only used for really old config files when the
@@ -31,7 +32,7 @@ var (
 
 func init() {
 	if configDir == "" {
-		configDir = filepath.Join(homedir.Get(), ".docker")
+		configDir = filepath.Join(homedir.Get(), configFileDir)
 	}
 }
 
diff --git a/image/v1/imagev1.go b/image/v1/imagev1.go
index cc76fbfeec..1e45b62bd9 100644
--- a/image/v1/imagev1.go
+++ b/image/v1/imagev1.go
@@ -142,7 +142,7 @@ func rawJSON(value interface{}) *json.RawMessage {
 // ValidateID checks whether an ID string is a valid image ID.
 func ValidateID(id string) error {
 	if ok := validHex.MatchString(id); !ok {
-		return fmt.Errorf("image ID '%s' is invalid ", id)
+		return fmt.Errorf("image ID %q is invalid", id)
 	}
 	return nil
 }