diff --git a/rpc/transform.go b/rpc/transform.go
index 4e028c4b5..9a0827055 100644
--- a/rpc/transform.go
+++ b/rpc/transform.go
@@ -213,6 +213,9 @@ func toCoreBuildOptions(b *pb.BuildImageOptions) (*types.BuildOptions, error) {
 
 func toCoreReplaceOptions(r *pb.ReplaceOptions) (*types.ReplaceOptions, error) {
 	deployOpts, err := toCoreDeployOptions(r.DeployOpt)
+	if err != nil {
+		return nil, err
+	}
 
 	replaceOpts := &types.ReplaceOptions{
 		DeployOptions:  *deployOpts,