Merge pull request #5575 from vieux/pr-5428

Upstream-commit: 51933bd5e1d10eb4a3151088cf344d0d6e06a192
Component: engine

components/engine/docker/docker.go

@@ -132,7 +132,9 @@ func main() {
 
 		eng := engine.New()
 		// Load builtins
-		builtins.Register(eng)
+		if err := builtins.Register(eng); err != nil {
+			log.Fatal(err)
+		}
 		// load the daemon in the background so we can immediately start
 		// the http api so that connections don't fail while the daemon
 		// is booting