diff --git a/integration_tests/dockerfiles/Dockerfile_test_run_2 b/integration_tests/dockerfiles/Dockerfile_test_run_2
index b77ea9ea0..af279464a 100644
--- a/integration_tests/dockerfiles/Dockerfile_test_run_2
+++ b/integration_tests/dockerfiles/Dockerfile_test_run_2
@@ -17,3 +17,4 @@
 
 FROM gcr.io/google-appengine/debian9
 RUN echo "hey" 
+MAINTAINER kaniko
diff --git a/integration_tests/integration_test_yaml.go b/integration_tests/integration_test_yaml.go
index 38d54ac52..fc01d4848 100644
--- a/integration_tests/integration_test_yaml.go
+++ b/integration_tests/integration_test_yaml.go
@@ -182,7 +182,8 @@ type step struct {
 }
 
 type testyaml struct {
-	Steps []step
+	Steps   []step
+	Timeout string
 }
 
 func main() {
@@ -232,6 +233,7 @@ func main() {
 	y := testyaml{
 		Steps: []step{containerDiffStep, containerDiffPermissions, structureTestsStep, structureTestPermissions, GCSBucketTarBuildContext, uploadTarBuildContext, buildExecutorImage,
 			buildOnbuildImage, pushOnbuildBase},
+		Timeout: "1200s",
 	}
 	for _, test := range fileTests {
 		// First, build the image with docker
diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go
index f2dd30fb2..dd2de8a8a 100644
--- a/pkg/commands/commands.go
+++ b/pkg/commands/commands.go
@@ -20,6 +20,7 @@ import (
 	"github.com/containers/image/manifest"
 	"github.com/docker/docker/builder/dockerfile/instructions"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 type DockerCommand interface {
@@ -60,6 +61,9 @@ func GetCommand(cmd instructions.Command, buildcontext string) (DockerCommand, e
 		return &OnBuildCommand{cmd: c}, nil
 	case *instructions.VolumeCommand:
 		return &VolumeCommand{cmd: c}, nil
+	case *instructions.MaintainerCommand:
+		logrus.Warnf("%s is deprecated, skipping", cmd.Name())
+		return nil, nil
 	}
 	return nil, errors.Errorf("%s is not a supported command", cmd.Name())
 }
diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go
index 58871466e..ee7c87e45 100644
--- a/pkg/executor/executor.go
+++ b/pkg/executor/executor.go
@@ -85,6 +85,9 @@ func DoBuild(dockerfilePath, srcContext, destination, snapshotMode string) error
 			if err != nil {
 				return err
 			}
+			if dockerCommand == nil {
+				continue
+			}
 			if err := dockerCommand.ExecuteCommand(imageConfig); err != nil {
 				return err
 			}