diff --git a/dashboard/app/build/handler.go b/dashboard/app/build/handler.go
index 780d11e7..9682ea93 100644
--- a/dashboard/app/build/handler.go
+++ b/dashboard/app/build/handler.go
@@ -47,6 +47,9 @@ func commitHandler(r *http.Request) (interface{}, error) {
 		com.PackagePath = r.FormValue("packagePath")
 		com.Hash = r.FormValue("hash")
 		if err := datastore.Get(c, com.Key(c), com); err != nil {
+			if err == datastore.ErrNoSuchEntity {
+				return nil, errors.New("Commit not found")
+			}
 			return nil, fmt.Errorf("getting Commit: %v", err)
 		}
 		if com.Num == 0 {