diff --git a/engine/engine.go b/engine/engine.go
index dc1984ccb5..58b43eca04 100644
--- a/engine/engine.go
+++ b/engine/engine.go
@@ -118,13 +118,13 @@ func (eng *Engine) Job(name string, args ...string) *Job {
 	if eng.Logging {
 		job.Stderr.Add(utils.NopWriteCloser(eng.Stderr))
 	}
-	if eng.catchall != nil {
+
+	// Catchall is shadowed by specific Register.
+	if handler, exists := eng.handlers[name]; exists {
+		job.handler = handler
+	} else if eng.catchall != nil && name != "" {
+		// empty job names are illegal, catchall or not.
 		job.handler = eng.catchall
-	} else {
-		handler, exists := eng.handlers[name]
-		if exists {
-			job.handler = handler
-		}
 	}
 	return job
 }
diff --git a/engine/engine_test.go b/engine/engine_test.go
index 8023bd58f3..de7f74012e 100644
--- a/engine/engine_test.go
+++ b/engine/engine_test.go
@@ -133,3 +133,19 @@ func TestParseJob(t *testing.T) {
 		t.Fatalf("Job was not called")
 	}
 }
+
+func TestCatchallEmptyName(t *testing.T) {
+	eng := New()
+	var called bool
+	eng.RegisterCatchall(func(job *Job) Status {
+		called = true
+		return StatusOK
+	})
+	err := eng.Job("").Run()
+	if err == nil {
+		t.Fatalf("Engine.Job(\"\").Run() should return an error")
+	}
+	if called {
+		t.Fatalf("Engine.Job(\"\").Run() should return an error")
+	}
+}