diff --git a/daemon/create.go b/daemon/create.go
index 58c40ec267..385618c7b4 100644
--- a/daemon/create.go
+++ b/daemon/create.go
@@ -16,8 +16,8 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
 		return "", nil, fmt.Errorf("Config cannot be empty in order to create a container")
 	}
 
-	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
 	warnings, err := daemon.verifyContainerSettings(hostConfig, config)
+	daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
 	if err != nil {
 		return "", warnings, err
 	}