diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
index d9b93f247af..b916f73e470 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
@@ -68,6 +68,14 @@ public boolean isRunning() {
     public boolean isPending() {
       return this == PENDING;
     }
+
+    public boolean isError() {
+      return this == ERROR;
+    }
+
+    public boolean isFinished() {
+      return this == FINISHED;
+    }
   }
 
   private String jobName;
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
index 2796500ac86..1b7daca45dd 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
@@ -52,9 +52,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.google.gson.GsonBuilder;
-import com.google.gson.stream.JsonReader;
-import java.io.StringReader;
 /**
  * Rest api endpoint for the noteBook.
  */
@@ -214,7 +211,7 @@ public Response getNotebook(@PathParam("notebookId") String notebookId) throws I
 
   /**
    * export note REST API
-   * 
+   *
    * @param
    * @return note JSON with status.OK
    * @throws IOException
@@ -228,7 +225,7 @@ public Response exportNoteBook(@PathParam("id") String noteId) throws IOExceptio
 
   /**
    * import new note REST API
-   * 
+   *
    * @param req - notebook Json
    * @return JSON with new note ID
    * @throws IOException
@@ -239,7 +236,7 @@ public Response importNotebook(String req) throws IOException {
     Note newNote = notebook.importNote(req, null);
     return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build();
   }
-  
+
   /**
    * Create new note REST API
    * @param message - JSON with new note name
@@ -259,6 +256,9 @@ public Response createNote(String message) throws IOException {
         Paragraph p = note.addParagraph();
         p.setTitle(paragraphRequest.getTitle());
         p.setText(paragraphRequest.getText());
+        if (paragraphRequest.getSkipOnError()) {
+          p.getConfig().put("skipOnError", true);
+        }
       }
     }
     note.addParagraph(); // add one paragraph to the last
@@ -292,7 +292,7 @@ public Response deleteNote(@PathParam("notebookId") String notebookId) throws IO
     notebookServer.broadcastNoteList();
     return new JsonResponse<>(Status.OK, "").build();
   }
-  
+
   /**
    * Clone note REST API
    * @param
@@ -451,7 +451,7 @@ public Response runNoteJobs(@PathParam("notebookId") String notebookId) throws
     if (note == null) {
       return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build();
     }
-    
+
     note.runAll();
     return new JsonResponse<>(Status.OK).build();
   }
@@ -479,7 +479,7 @@ public Response stopNoteJobs(@PathParam("notebookId") String notebookId) throws
     }
     return new JsonResponse<>(Status.OK).build();
   }
-  
+
   /**
    * Get notebook job status REST API
    * @param
@@ -498,10 +498,10 @@ public Response getNoteJobStatus(@PathParam("notebookId") String notebookId) thr
 
     return new JsonResponse<>(Status.OK, null, note.generateParagraphsInfo()).build();
   }
-  
+
   /**
    * Run paragraph job REST API
-   * 
+   *
    * @param message - JSON with params if user wants to update dynamic form's value
    *                null, empty string, empty json if user doesn't want to update
    *
@@ -510,7 +510,7 @@ public Response getNoteJobStatus(@PathParam("notebookId") String notebookId) thr
    */
   @POST
   @Path("job/{notebookId}/{paragraphId}")
-  public Response runParagraph(@PathParam("notebookId") String notebookId, 
+  public Response runParagraph(@PathParam("notebookId") String notebookId,
                                @PathParam("paragraphId") String paragraphId,
                                String message) throws
                                IOException, IllegalArgumentException {
@@ -549,7 +549,7 @@ public Response runParagraph(@PathParam("notebookId") String notebookId,
    */
   @DELETE
   @Path("job/{notebookId}/{paragraphId}")
-  public Response stopParagraph(@PathParam("notebookId") String notebookId, 
+  public Response stopParagraph(@PathParam("notebookId") String notebookId,
                                 @PathParam("paragraphId") String paragraphId) throws
                                 IOException, IllegalArgumentException {
     LOG.info("stop paragraph job {} ", notebookId);
@@ -565,7 +565,7 @@ public Response stopParagraph(@PathParam("notebookId") String notebookId,
     p.abort();
     return new JsonResponse<>(Status.OK).build();
   }
-    
+
   /**
    * Register cron job REST API
    * @param message - JSON with cron expressions.
@@ -580,12 +580,12 @@ public Response registerCronJob(@PathParam("notebookId") String notebookId, Stri
 
     CronRequest request = gson.fromJson(message,
                           CronRequest.class);
-    
+
     Note note = notebook.getNote(notebookId);
     if (note == null) {
       return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build();
     }
-    
+
     if (!CronExpression.isValidExpression(request.getCronString())) {
       return new JsonResponse<>(Status.BAD_REQUEST, "wrong cron expressions.").build();
     }
@@ -594,10 +594,10 @@ public Response registerCronJob(@PathParam("notebookId") String notebookId, Stri
     config.put("cron", request.getCronString());
     note.setConfig(config);
     notebook.refreshCron(note.id());
-    
+
     return new JsonResponse<>(Status.OK).build();
   }
-  
+
   /**
    * Remove cron job REST API
    * @param
@@ -614,15 +614,15 @@ public Response removeCronJob(@PathParam("notebookId") String notebookId) throws
     if (note == null) {
       return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build();
     }
-    
+
     Map<String, Object> config = note.getConfig();
     config.put("cron", null);
     note.setConfig(config);
     notebook.refreshCron(note.id());
-    
+
     return new JsonResponse<>(Status.OK).build();
-  }  
-  
+  }
+
   /**
    * Get cron job REST API
    * @param
@@ -639,9 +639,9 @@ public Response getCronJob(@PathParam("notebookId") String notebookId) throws
     if (note == null) {
       return new JsonResponse<>(Status.NOT_FOUND, "note not found.").build();
     }
-    
+
     return new JsonResponse<>(Status.OK, note.getConfig().get("cron")).build();
-  }  
+  }
 
   /**
    * Search for a Notes
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewParagraphRequest.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewParagraphRequest.java
index bde920b8337..5e138ebad60 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewParagraphRequest.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewParagraphRequest.java
@@ -25,6 +25,7 @@
 public class NewParagraphRequest {
   String title;
   String text;
+  boolean skipOnError;
   Double index;
 
   public NewParagraphRequest() {
@@ -39,6 +40,10 @@ public String getText() {
     return text;
   }
 
+  public boolean getSkipOnError() {
+    return skipOnError;
+  }
+
   public Double getIndex() {
     return index;
   }
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
index 913e184619e..f21422e21f6 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
@@ -52,6 +52,8 @@ public static enum OP {
     IMPORT_NOTE,  // [c-s] import notebook
                   // @param object notebook
     NOTE_UPDATE,
+    RUN_NOTE,   // [c-s] run notebook
+                // @param id note id
 
     RUN_PARAGRAPH, // [c-s] run paragraph
                    // @param id paragraph id
@@ -100,7 +102,7 @@ public static enum OP {
 
     ANGULAR_OBJECT_UPDATE,  // [s-c] add/update angular object
     ANGULAR_OBJECT_REMOVE,  // [s-c] add angular object del
-    
+
     ANGULAR_OBJECT_UPDATED,  // [c-s] angular object value updated,
 
     ANGULAR_OBJECT_CLIENT_BIND,  // [c-s] angular object updated from AngularJS z object
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 9412d7198d7..8d3add68831 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -20,33 +20,40 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.google.common.base.Strings;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
 import org.apache.zeppelin.display.AngularObject;
 import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.display.AngularObjectRegistryListener;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
-import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
-import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.interpreter.InterpreterOutput;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
+import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
 import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcessListener;
-import org.apache.zeppelin.notebook.*;
+import org.apache.zeppelin.notebook.JobListenerFactory;
+import org.apache.zeppelin.notebook.Note;
+import org.apache.zeppelin.notebook.Notebook;
+import org.apache.zeppelin.notebook.NotebookAuthorization;
+import org.apache.zeppelin.notebook.Paragraph;
+import org.apache.zeppelin.notebook.ParagraphJobListener;
 import org.apache.zeppelin.scheduler.Job;
 import org.apache.zeppelin.scheduler.Job.Status;
 import org.apache.zeppelin.server.ZeppelinServer;
 import org.apache.zeppelin.socket.Message.OP;
 import org.apache.zeppelin.ticket.TicketContainer;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.utils.SecurityUtils;
 import org.eclipse.jetty.websocket.WebSocket;
 import org.eclipse.jetty.websocket.WebSocketServlet;
@@ -54,6 +61,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Strings;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
 /**
  * Zeppelin websocket service.
  *
@@ -107,7 +118,7 @@ public void onMessage(NotebookSocket conn, String msg) {
       if (LOG.isTraceEnabled()) {
         LOG.trace("RECEIVE MSG = " + messagereceived);
       }
-      
+
       String ticket = TicketContainer.instance.getTicket(messagereceived.principal);
       if (ticket != null && !ticket.equals(messagereceived.ticket))
         throw new Exception("Invalid ticket " + messagereceived.ticket + " != " + ticket);
@@ -155,6 +166,9 @@ public void onMessage(NotebookSocket conn, String msg) {
           case IMPORT_NOTE:
             importNote(conn, userAndRoles, notebook, messagereceived);
             break;
+          case RUN_NOTE:
+            runNote(conn, userAndRoles, notebook, messagereceived);
+            break;
           case COMMIT_PARAGRAPH:
             updateParagraph(conn, userAndRoles, notebook, messagereceived);
             break;
@@ -530,6 +544,25 @@ private void removeNote(NotebookSocket conn, HashSet<String> userAndRoles,
     broadcastNoteList();
   }
 
+  private void runNote(NotebookSocket conn, HashSet<String> userAndRoles,
+          Notebook notebook, Message fromMessage)
+      throws IOException {
+    String noteId = (String) fromMessage.get("id");
+    if (noteId == null) {
+      return;
+    }
+
+    Note note = notebook.getNote(noteId);
+    NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();
+    if (!notebookAuthorization.isOwner(noteId, userAndRoles)) {
+      permissionError(conn, "remove", userAndRoles, notebookAuthorization.getOwners(noteId));
+      return;
+    }
+
+    note.runAll();
+    broadcastNoteList();
+  }
+
   private void updateParagraph(NotebookSocket conn, HashSet<String> userAndRoles,
                                Notebook notebook, Message fromMessage) throws IOException {
     String paragraphId = (String) fromMessage.get("id");
@@ -1082,6 +1115,8 @@ public void beforeStatusChange(Job job, Status before, Status after) {
 
     @Override
     public void afterStatusChange(Job job, Status before, Status after) {
+      note.setExecutionStatus(job.getId(), after);
+
       if (after == Status.ERROR) {
         if (job.getException() != null) {
           LOG.error("Error", job.getException());
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
index d1135c052fb..e51e96cf440 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
@@ -239,7 +239,7 @@ public void testDisableParagraphRunButton() throws Exception {
           driver.findElement(By.xpath(getParagraphXPath(1) + "//span[@class='icon-control-play']")).isDisplayed(), CoreMatchers.equalTo(false)
       );
 
-      driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='runNote()']")).sendKeys(Keys.ENTER);
+      driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='runNote(note.id)']")).sendKeys(Keys.ENTER);
       sleep(1000, true);
       driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'Run all paragraphs?')]" +
           "//div[@class='modal-footer']//button[contains(.,'OK')]")).click();
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index f371bd318a8..85e328dc1a8 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -19,7 +19,7 @@ <h3>
     <span class="labelBtn btn-group">
       <button type="button"
               class="btn btn-default btn-xs"
-              ng-click="runNote()"
+              ng-click="runNote(note.id)"
               ng-class="{'disabled':isNoteRunning()}"
               tooltip-placement="bottom" tooltip="Run all paragraphs">
         <i class="icon-control-play"></i>
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index fb1120e8b34..4c3725723d6 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -169,17 +169,17 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl',
     document.getElementById('note.checkpoint.message').value='';
   };
 
-  $scope.runNote = function() {
+  $scope.runNote = function(noteId) {
     BootstrapDialog.confirm({
       closable: true,
       title: '',
       message: 'Run all paragraphs?',
       callback: function(result) {
-        if (result) {
-          _.forEach($scope.note.paragraphs, function (n, key) {
-            angular.element('#' + n.id + '_paragraphColumn_main').scope().runParagraph(n.text);
-          });
-        }
+        _.forEach($scope.note.paragraphs, function(n, key) {
+          angular.element('#' + n.id + '_paragraphColumn_main').scope().saveParagraph();
+        });
+
+        websocketMsgSrv.runNote(noteId);
       }
     });
   };
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
index c35c4e5ade3..85cf58948a8 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-control.html
@@ -80,6 +80,10 @@
           {{paragraph.config.enabled ? "Disable" : "Enable"}} run</a>
       </li>
       <li>
+        <a ng-click="toggleSkipOnError()"><span class="icon-control-forward"></span>
+          {{paragraph.config.skipOnError ? "Disable" : "Enable"}} Skip On Error</a>
+      </li>
+      <li>      
         <a ng-click="goToSingleParagraph()"><span class="icon-share-alt"></span> Link this paragraph</a>
       </li>
       <li>
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index bb9bc89cc33..9e2af7eb2c8 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -454,6 +454,13 @@ angular.module('zeppelinWebApp')
     websocketMsgSrv.cancelParagraphRun($scope.paragraph.id);
   };
 
+  $scope.toggleSkipOnError = function () {
+    $scope.paragraph.config.skipOnError = $scope.paragraph.config.skipOnError ? false : true;
+    var newParams = angular.copy($scope.paragraph.settings.params);
+    var newConfig = angular.copy($scope.paragraph.config);
+    commitParagraph($scope.paragraph.title, $scope.paragraph.text, newConfig, newParams);
+  };
+
   $scope.runParagraph = function(data) {
     websocketMsgSrv.runParagraph($scope.paragraph.id, $scope.paragraph.title,
                                  data, $scope.paragraph.config, $scope.paragraph.settings.params);
diff --git a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
index 3b4df03796c..d963ca641f2 100644
--- a/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
+++ b/zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
@@ -110,6 +110,10 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope,
       });
     },
 
+    runNote: function(noteId) {
+      websocketEvents.sendNewEvent({op: 'RUN_NOTE', data: {id: noteId}});
+    },
+
     removeParagraph: function(paragraphId) {
       websocketEvents.sendNewEvent({op: 'PARAGRAPH_REMOVE', data: {id: paragraphId}});
     },
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index b33391a7d02..6cb457bb79e 100755
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -333,7 +333,7 @@ public String getUser() {
   public String getBucketName() {
     return getString(ConfVars.ZEPPELIN_NOTEBOOK_S3_BUCKET);
   }
-  
+
   public String getEndpoint() {
     return getString(ConfVars.ZEPPELIN_NOTEBOOK_S3_ENDPOINT);
   }
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
index 6a097355386..153ea7860d3 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.*;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -63,6 +62,7 @@ public class Note implements Serializable, JobListener {
 
   @SuppressWarnings("rawtypes")
   Map<String, List<AngularObject>> angularObjects = new HashMap<>();
+  private Map<String, Status> executionStatus = new HashMap<>();
 
   private transient NoteInterpreterLoader replLoader;
   private transient JobListenerFactory jobListenerFactory;
@@ -149,6 +149,10 @@ public Map<String, List<AngularObject>> getAngularObjects() {
     return angularObjects;
   }
 
+  public void setExecutionStatus(String paraId, Status status) {
+    executionStatus.put(paraId, status);
+  }
+
   /**
    * Add paragraph last.
    */
@@ -350,15 +354,27 @@ public List<Map<String, String>> generateParagraphsInfo (){
    * Run all paragraphs sequentially.
    */
   public void runAll() {
-    synchronized (paragraphs) {
-      for (Paragraph p : paragraphs) {
-        if (!p.isEnabled()) {
-          continue;
-        }
-        p.setNoteReplLoader(replLoader);
-        p.setListener(jobListenerFactory.getParagraphJobListener(this));
-        Interpreter intp = replLoader.get(p.getRequiredReplName());
-        intp.getScheduler().submit(p);
+    boolean noteExecutionHasError = false;
+    for (Paragraph p : paragraphs) {
+      if (!p.isEnabled()) {
+        continue;
+      }
+
+      if (noteExecutionHasError && p.isSkipOnError()) {
+        logger.info("Paragraph " + p.getId() + " execution skipped as "
+              + "other para in note resulted in error");
+        continue;
+      }
+
+      p.setNoteReplLoader(replLoader);
+      p.setListener(jobListenerFactory.getParagraphJobListener(this));
+      Interpreter intp = replLoader.get(p.getRequiredReplName());
+      intp.getScheduler().submit(p);
+
+      Status lastParaExecutionStatus = getCompletionStatus(p.getId());
+      if (lastParaExecutionStatus.isError() ||
+              (p.getResult().code() == InterpreterResult.Code.ERROR)) {
+        noteExecutionHasError = true;
       }
     }
   }
@@ -394,6 +410,22 @@ public List<Paragraph> getParagraphs() {
     }
   }
 
+  private Status getCompletionStatus(String paraId) {
+    while (!executionStatus.containsKey(paraId) ||
+          executionStatus.get(paraId).isPending() ||
+          executionStatus.get(paraId).isReady() ||
+          executionStatus.get(paraId).isRunning()) {
+      // Just wait until the paragraph is executed
+      try {
+        Thread.sleep(500);
+      } catch (InterruptedException e) {
+        logger.error("Error while waiting until paragraph gets executed", e);
+      }
+    }
+
+    return executionStatus.get(paraId);
+  }
+
   private void snapshotAngularObjectRegistry() {
     angularObjects = new HashMap<>();
 
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
index bb4d69b717f..6cc387feb9f 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java
@@ -116,6 +116,11 @@ public boolean isEnabled() {
     return enabled == null || enabled.booleanValue();
   }
 
+  public boolean isSkipOnError() {
+    Boolean skipOnFailure = (Boolean) config.get("skipOnError");
+    return skipOnFailure != null && skipOnFailure.booleanValue();
+  }
+
   public String getRequiredReplName() {
     return getRequiredReplName(text);
   }
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockErrorInterpreter.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockErrorInterpreter.java
new file mode 100644
index 00000000000..2f77e753598
--- /dev/null
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/mock/MockErrorInterpreter.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zeppelin.interpreter.mock;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.zeppelin.interpreter.Interpreter;
+import org.apache.zeppelin.interpreter.InterpreterContext;
+import org.apache.zeppelin.interpreter.InterpreterException;
+import org.apache.zeppelin.interpreter.InterpreterResult;
+import org.apache.zeppelin.scheduler.Scheduler;
+import org.apache.zeppelin.scheduler.SchedulerFactory;
+
+public class MockErrorInterpreter extends Interpreter{
+  Map<String, Object> vars = new HashMap<String, Object>();
+
+  public MockErrorInterpreter(Properties property) {
+    super(property);
+  }
+
+  @Override
+  public void open() {
+  }
+
+  @Override
+  public void close() {
+  }
+
+  @Override
+  public InterpreterResult interpret(String st, InterpreterContext context) {
+        InterpreterResult result;
+
+    if ("error".equals(st)) {
+      throw new InterpreterException("Error...");
+    } else {
+      result = new InterpreterResult(InterpreterResult.Code.ERROR, "error: " + st);
+      if (context.getResourcePool() != null) {
+        context.getResourcePool().put(context.getNoteId(), context.getParagraphId(), "result", result);
+      }
+    }
+
+    return result;
+  }
+
+  @Override
+  public void cancel(InterpreterContext context) {
+  }
+
+  @Override
+  public FormType getFormType() {
+    return FormType.SIMPLE;
+  }
+
+  @Override
+  public int getProgress(InterpreterContext context) {
+    return 0;
+  }
+
+  @Override
+  public Scheduler getScheduler() {
+    return SchedulerFactory.singleton().createOrGetFIFOScheduler("test_"+this.hashCode());
+  }
+
+  @Override
+  public List<String> completion(String buf, int cursor) {
+    return null;
+  }
+}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
index 3c89c35a72d..78887f6e7d3 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
@@ -34,6 +34,7 @@
 import org.apache.zeppelin.dep.DependencyResolver;
 import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.interpreter.*;
+import org.apache.zeppelin.interpreter.mock.MockErrorInterpreter;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
 import org.apache.zeppelin.notebook.repo.NotebookRepo;
@@ -75,7 +76,10 @@ public void setUp() throws Exception {
 
     System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), tmpDir.getAbsolutePath());
     System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(), notebookDir.getAbsolutePath());
-    System.setProperty(ConfVars.ZEPPELIN_INTERPRETERS.getVarName(), "org.apache.zeppelin.interpreter.mock.MockInterpreter1,org.apache.zeppelin.interpreter.mock.MockInterpreter2");
+    System.setProperty(ConfVars.ZEPPELIN_INTERPRETERS.getVarName(),
+            "org.apache.zeppelin.interpreter.mock.MockInterpreter1,"
+            + "org.apache.zeppelin.interpreter.mock.MockInterpreter2,"
+            + "org.apache.zeppelin.interpreter.mock.MockErrorInterpreter");
 
     conf = ZeppelinConfiguration.create();
 
@@ -83,6 +87,7 @@ public void setUp() throws Exception {
 
     MockInterpreter1.register("mock1", "org.apache.zeppelin.interpreter.mock.MockInterpreter1");
     MockInterpreter2.register("mock2", "org.apache.zeppelin.interpreter.mock.MockInterpreter2");
+    MockErrorInterpreter.register("mockerrorinterpreter", "org.apache.zeppelin.interpreter.mock.MockErrorInterpreter");
 
     depResolver = new DependencyResolver(tmpDir.getAbsolutePath() + "/local-repo");
     factory = new InterpreterFactory(conf, new InterpreterOption(false), null, null, depResolver);
@@ -271,7 +276,7 @@ public void testAutoRestartInterpreterAfterSchedule() throws InterruptedExceptio
     // create a note and a paragraph
     Note note = notebook.createNote();
     note.getNoteReplLoader().setInterpreters(factory.getDefaultInterpreterSettingList());
-    
+
     Paragraph p = note.addParagraph();
     Map config = new HashMap<String, Object>();
     p.setConfig(config);
@@ -300,7 +305,7 @@ public void testAutoRestartInterpreterAfterSchedule() throws InterruptedExceptio
       Thread.sleep(100);
     }
     assertNotEquals(dateFinished, p.getDateFinished());
-    
+
     // remove cron scheduler.
     config.put("cron", null);
     note.setConfig(config);
@@ -503,7 +508,9 @@ public void testAbortParagraphStatusOnInterpreterRestart() throws InterruptedExc
       assertEquals(Job.Status.READY, p.getStatus());
     }
 
-    note.runAll();
+    for (Paragraph p : paragraphs) {
+      note.run(p.getId());
+    }
 
     while (paragraphs.get(0).getStatus() != Status.FINISHED) Thread.yield();
 
@@ -639,29 +646,70 @@ else if(file.isDirectory()){
     }
   }
 
+  @Test
+  public void testSkipOnError() throws IOException {
+    Note note = notebook.createNote();
+    note.getNoteReplLoader().setInterpreters(factory.getDefaultInterpreterSettingList());
+
+    // p1
+    Paragraph p1 = note.addParagraph();
+    Map config1 = p1.getConfig();
+    config1.put("enabled", true);
+    p1.setConfig(config1);
+    p1.setText("%mockerrorinterpreter error");
+
+    // p2
+    Paragraph p2 = note.addParagraph();
+    Map config2 = p2.getConfig();
+    config2.put("skipOnError", true);
+    p2.setConfig(config2);
+    p2.setText("p2");
+
+    // p3
+    Paragraph p3 = note.addParagraph();
+    p3.setText("%mockerrorinterpreter p3");
+
+    // when
+    note.runAll();
+    // wait for finish
+    while(p3.isTerminated()==false) {
+      Thread.yield();
+    }
+
+    assertEquals("Error...", p1.getException().getMessage());
+    assertNull(p2.getResult());
+    assertEquals("error: p3", p3.getResult().message());
+
+    notebook.removeNote(note.getId());
+  }
+
   @Override
   public ParagraphJobListener getParagraphJobListener(Note note) {
-    return new ParagraphJobListener(){
+    return new TestParagraphJobListenerImpl(note);
+  }
 
-      @Override
-      public void onOutputAppend(Paragraph paragraph, InterpreterOutput out, String output) {
-      }
+  private static class TestParagraphJobListenerImpl implements ParagraphJobListener {
+    private Note note;
 
-      @Override
-      public void onOutputUpdate(Paragraph paragraph, InterpreterOutput out, String output) {
-      }
+    public TestParagraphJobListenerImpl(Note note) {
+      this.note = note;
+    }
 
-      @Override
-      public void onProgressUpdate(Job job, int progress) {
-      }
+    @Override
+    public void onOutputAppend(Paragraph paragraph, InterpreterOutput out, String output) { }
 
-      @Override
-      public void beforeStatusChange(Job job, Status before, Status after) {
-      }
+    @Override
+    public void onOutputUpdate(Paragraph paragraph, InterpreterOutput out, String output) { }
 
-      @Override
-      public void afterStatusChange(Job job, Status before, Status after) {
-      }
-    };
+    @Override
+    public void onProgressUpdate(Job job, int progress) { }
+
+    @Override
+    public void beforeStatusChange(Job job, Status before, Status after) { }
+
+    @Override
+    public void afterStatusChange(Job job, Status before, Status after) {
+      note.setExecutionStatus(job.getId(), after);
+    }
   }
 }