diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index f4e97c955ce..73c66c07201 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -104,6 +104,12 @@
       <version>1.0.8</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.0.1</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 0655f3a65a3..5f784d7eb7b 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -19,15 +19,16 @@
 import java.nio.charset.StandardCharsets;
 import java.io.IOException;
 import java.security.PrivilegedExceptionAction;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.util.*;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.DriverManagerConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.PoolingDriver;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.pool2.ObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.zeppelin.interpreter.Interpreter;
 import org.apache.zeppelin.interpreter.InterpreterContext;
@@ -99,14 +100,15 @@ public class JDBCInterpreter extends Interpreter {
 
   static final String EMPTY_COLUMN_VALUE = "";
 
+
   private final String CONCURRENT_EXECUTION_KEY = "zeppelin.jdbc.concurrent.use";
   private final String CONCURRENT_EXECUTION_COUNT = "zeppelin.jdbc.concurrent.max_connection";
 
+  private final String DBCP_STRING = "jdbc:apache:commons:dbcp:";
+
   private final HashMap<String, Properties> propertiesMap;
   private final Map<String, Statement> paragraphIdStatementMap;
-
-  private final Map<String, ArrayList<Connection>> propertyKeyUnusedConnectionListMap;
-  private final Map<String, Connection> paragraphIdConnectionMap;
+  private final Map<String, PoolingDriver> poolingDriverMap;
 
   private final Map<String, SqlCompleter> propertyKeySqlCompleterMap;
 
@@ -122,9 +124,8 @@ public InterpreterCompletion apply(CharSequence seq) {
   public JDBCInterpreter(Properties property) {
     super(property);
     propertiesMap = new HashMap<>();
-    propertyKeyUnusedConnectionListMap = new HashMap<>();
     paragraphIdStatementMap = new HashMap<>();
-    paragraphIdConnectionMap = new HashMap<>();
+    poolingDriverMap = new HashMap<>();
     propertyKeySqlCompleterMap = new HashMap<>();
   }
 
@@ -193,22 +194,41 @@ private SqlCompleter createSqlCompleter(Connection jdbcConnection) {
     return completer;
   }
 
+  private boolean isConnectionInPool(String driverName) {
+    if (poolingDriverMap.containsKey(driverName)) return true;
+    return false;
+  }
+
+  private void createConnectionPool(String url, String propertyKey, Properties properties) {
+    ConnectionFactory connectionFactory =
+      new DriverManagerConnectionFactory(url, properties);
+
+    PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(
+      connectionFactory, null);
+    ObjectPool connectionPool = new GenericObjectPool(poolableConnectionFactory);
+
+    poolableConnectionFactory.setPool(connectionPool);
+    PoolingDriver driver = new PoolingDriver();
+    driver.registerPool(propertyKey, connectionPool);
+
+    poolingDriverMap.put(propertyKey, driver);
+  }
+
+  private Connection getConnectionFromPool(String url, String propertyKey, Properties properties)
+      throws SQLException {
+    if (!isConnectionInPool(propertyKey)) {
+      createConnectionPool(url, propertyKey, properties);
+    }
+
+    return DriverManager.getConnection(DBCP_STRING + propertyKey);
+  }
+
   public Connection getConnection(String propertyKey, String user)
       throws ClassNotFoundException, SQLException, InterpreterException {
     Connection connection = null;
     if (propertyKey == null || propertiesMap.get(propertyKey) == null) {
       return null;
     }
-    if (propertyKeyUnusedConnectionListMap.containsKey(propertyKey)) {
-      ArrayList<Connection> connectionList = propertyKeyUnusedConnectionListMap.get(propertyKey);
-      if (0 != connectionList.size()) {
-        connection = propertyKeyUnusedConnectionListMap.get(propertyKey).remove(0);
-        if (null != connection && connection.isClosed()) {
-          connection.close();
-          connection = null;
-        }
-      }
-    }
     if (null == connection) {
       final Properties properties = (Properties) propertiesMap.get(propertyKey).clone();
       logger.info(properties.getProperty(DRIVER_KEY));
@@ -222,16 +242,16 @@ public Connection getConnection(String propertyKey, String user)
         switch (authType) {
             case KERBEROS:
               if (user == null) {
-                connection = DriverManager.getConnection(url, properties);
+                connection = getConnectionFromPool(url, propertyKey, properties);
               } else {
                 if ("hive".equalsIgnoreCase(propertyKey)) {
-                  connection = DriverManager.getConnection(url + ";hive.server2.proxy.user=" + user,
-                      properties);
+                  connection = getConnectionFromPool(url + ";hive.server2.proxy.user=" + user,
+                    propertyKey, properties);
                 } else {
                   UserGroupInformation ugi = null;
                   try {
                     ugi = UserGroupInformation.createProxyUser(user,
-                        UserGroupInformation.getCurrentUser());
+                      UserGroupInformation.getCurrentUser());
                   } catch (Exception e) {
                     logger.error("Error in createProxyUser", e);
                     StringBuilder stringBuilder = new StringBuilder();
@@ -239,11 +259,13 @@ public Connection getConnection(String propertyKey, String user)
                     stringBuilder.append(e.getCause());
                     throw new InterpreterException(stringBuilder.toString());
                   }
+
+                  final String poolKey = propertyKey;
                   try {
                     connection = ugi.doAs(new PrivilegedExceptionAction<Connection>() {
                       @Override
                       public Connection run() throws Exception {
-                        return DriverManager.getConnection(url, properties);
+                        return getConnectionFromPool(url, poolKey, properties);
                       }
                     });
                   } catch (Exception e) {
@@ -258,7 +280,7 @@ public Connection run() throws Exception {
               break;
 
             default:
-              connection = DriverManager.getConnection(url, properties);
+              connection = getConnectionFromPool(url, propertyKey, properties);
         }
       }
     }
@@ -266,75 +288,41 @@ public Connection run() throws Exception {
     return connection;
   }
 
-  public Statement getStatement(String propertyKey, String paragraphId,
-                                InterpreterContext interpreterContext)
-      throws SQLException, ClassNotFoundException, InterpreterException {
-    Connection connection;
-
-    if (paragraphIdConnectionMap.containsKey(paragraphId +
-        interpreterContext.getAuthenticationInfo().getUser())) {
-      connection = paragraphIdConnectionMap.get(paragraphId +
-          interpreterContext.getAuthenticationInfo().getUser());
-    } else {
-      connection = getConnection(propertyKey, interpreterContext.getAuthenticationInfo().getUser());
-    }
-
-    if (connection == null) {
-      return null;
+  private void initStatementMap() {
+    for (Statement statement : paragraphIdStatementMap.values()) {
+      try {
+        statement.close();
+      } catch (Exception e) {
+        logger.error("Error while closing paragraphIdStatementMap statement...", e);
+      }
     }
+    paragraphIdStatementMap.clear();
+  }
 
-    Statement statement = connection.createStatement();
-    if (isStatementClosed(statement)) {
-      connection = getConnection(propertyKey, interpreterContext.getAuthenticationInfo().getUser());
-      statement = connection.createStatement();
+  private void initConnectionPoolMap() throws SQLException {
+    Iterator<String> it = poolingDriverMap.keySet().iterator();
+    while (it.hasNext()) {
+      String driverName = it.next();
+      poolingDriverMap.get(driverName).closePool(driverName);
+      it.remove();
     }
-    paragraphIdConnectionMap.put(paragraphId + interpreterContext.getAuthenticationInfo().getUser(),
-        connection);
-    paragraphIdStatementMap.put(paragraphId + interpreterContext.getAuthenticationInfo().getUser(),
-        statement);
+    poolingDriverMap.clear();
+  }
 
-    return statement;
+  private void saveStatement(String key, Statement statement) throws SQLException {
+    paragraphIdStatementMap.put(key, statement);
+    statement.setMaxRows(getMaxResult());
   }
 
-  private boolean isStatementClosed(Statement statement) {
-    try {
-      return statement.isClosed();
-    } catch (Throwable t) {
-      logger.debug("{} doesn't support isClosed method", statement);
-      return false;
-    }
+  private void removeStatement(String key) {
+    paragraphIdStatementMap.remove(key);
   }
 
   @Override
   public void close() {
     try {
-      for (List<Connection> connectionList : propertyKeyUnusedConnectionListMap.values()) {
-        for (Connection c : connectionList) {
-          try {
-            c.close();
-          } catch (Exception e) {
-            logger.error("Error while closing propertyKeyUnusedConnectionListMap connection...", e);
-          }
-        }
-      }
-
-      for (Statement statement : paragraphIdStatementMap.values()) {
-        try {
-          statement.close();
-        } catch (Exception e) {
-          logger.error("Error while closing paragraphIdStatementMap statement...", e);
-        }
-      }
-      paragraphIdStatementMap.clear();
-
-      for (Connection connection : paragraphIdConnectionMap.values()) {
-        try {
-          connection.close();
-        } catch (Exception e) {
-          logger.error("Error while closing paragraphIdConnectionMap connection...", e);
-        }
-      }
-      paragraphIdConnectionMap.clear();
+      initStatementMap();
+      initConnectionPoolMap();
     } catch (Exception e) {
       logger.error("Error while closing...", e);
     }
@@ -342,17 +330,21 @@ public void close() {
 
   private InterpreterResult executeSql(String propertyKey, String sql,
       InterpreterContext interpreterContext) {
-
     String paragraphId = interpreterContext.getParagraphId();
+    Connection connection;
+    Statement statement;
+    ResultSet resultSet = null;
 
     try {
+      connection = getConnection(propertyKey, interpreterContext.getAuthenticationInfo().getUser());
+      if (connection == null) {
+        return new InterpreterResult(Code.ERROR, "Prefix not found.");
+      }
 
-      Statement statement = getStatement(propertyKey, paragraphId, interpreterContext);
-
+      statement = connection.createStatement();
       if (statement == null) {
         return new InterpreterResult(Code.ERROR, "Prefix not found.");
       }
-      statement.setMaxRows(getMaxResult());
 
       StringBuilder msg = null;
       boolean isTableType = false;
@@ -364,8 +356,9 @@ private InterpreterResult executeSql(String propertyKey, String sql,
         isTableType = true;
       }
 
-      ResultSet resultSet = null;
       try {
+        saveStatement(paragraphId +
+          interpreterContext.getAuthenticationInfo().getUser(), statement);
 
         boolean isResultSetAvailable = statement.execute(sql);
 
@@ -408,16 +401,24 @@ private InterpreterResult executeSql(String propertyKey, String sql,
           msg.append(updateCount).append(NEWLINE);
         }
       } finally {
-        try {
-          if (resultSet != null) {
+        if (resultSet != null) {
+          try {
             resultSet.close();
-          }
-          statement.close();
-        } finally {
-          statement = null;
+          } catch (SQLException e) { /*ignored*/ }
         }
+        if (statement != null) {
+          try {
+            statement.close();
+          } catch (SQLException e) { /*ignored*/ }
+        }
+        if (connection != null) {
+          try {
+            connection.close();
+          } catch (SQLException e) { /*ignored*/ }
+        }
+        removeStatement(paragraphId +
+          interpreterContext.getAuthenticationInfo().getUser());
       }
-
       return new InterpreterResult(Code.SUCCESS, msg.toString());
 
     } catch (Exception e) {
@@ -452,7 +453,6 @@ public InterpreterResult interpret(String cmd, InterpreterContext contextInterpr
     cmd = cmd.trim();
 
     logger.info("PropertyKey: {}, SQL command: '{}'", propertyKey, cmd);
-
     return executeSql(propertyKey, cmd, contextInterpreter);
   }
 
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 727211292b2..7b59aab479d 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
@@ -46,6 +46,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.apache.zeppelin.annotation.ZeppelinApi;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.notebook.Note;
 import org.apache.zeppelin.notebook.Notebook;
 import org.apache.zeppelin.notebook.NotebookAuthorization;
@@ -235,13 +236,20 @@ public Response exportNoteBook(@PathParam("id") String noteId) throws IOExceptio
    * @param req - notebook Json
    * @return JSON with new note ID
    * @throws IOException
+   * @throws DuplicateNameException 
    */
   @POST
   @Path("import")
   @ZeppelinApi
   public Response importNotebook(String req) throws IOException {
     AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
-    Note newNote = notebook.importNote(req, null, subject);
+    Note newNote;
+    try {
+      newNote = notebook.importNote(req, null, subject);
+    } catch (DuplicateNameException e) {
+      return new JsonResponse<>(Status.NOT_ACCEPTABLE, 
+          "Notebook already exists with same name").build();
+    }
     return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build();
   }
 
@@ -251,33 +259,37 @@ public Response importNotebook(String req) throws IOException {
    * @param message - JSON with new note name
    * @return JSON with new note ID
    * @throws IOException
+   * @throws DuplicateNameException 
    */
   @POST
   @Path("/")
   @ZeppelinApi
   public Response createNote(String message) throws IOException {
     LOG.info("Create new notebook by JSON {}", message);
-    NewNotebookRequest request = gson.fromJson(message, NewNotebookRequest.class);
-    AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
-    Note note = notebook.createNote(subject);
-    List<NewParagraphRequest> initialParagraphs = request.getParagraphs();
-    if (initialParagraphs != null) {
-      for (NewParagraphRequest paragraphRequest : initialParagraphs) {
-        Paragraph p = note.addParagraph();
-        p.setTitle(paragraphRequest.getTitle());
-        p.setText(paragraphRequest.getText());
+    String noteName = null;
+    Note note;
+    try {
+      NewNotebookRequest request = gson.fromJson(message, NewNotebookRequest.class);
+      noteName = request.getName();
+      AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
+      note = notebook.createNote(subject, noteName);
+      List<NewParagraphRequest> initialParagraphs = request.getParagraphs();
+      if (initialParagraphs != null) {
+        for (NewParagraphRequest paragraphRequest : initialParagraphs) {
+          Paragraph p = note.addParagraph();
+          p.setTitle(paragraphRequest.getTitle());
+          p.setText(paragraphRequest.getText());
+        }
       }
-    }
-    note.addParagraph(); // add one paragraph to the last
-    String noteName = request.getName();
-    if (noteName.isEmpty()) {
-      noteName = "Note " + note.getId();
-    }
+      note.addParagraph(); // add one paragraph to the last
 
-    note.setName(noteName);
-    note.persist(subject);
-    notebookServer.broadcastNote(note);
-    notebookServer.broadcastNoteList(subject);
+      note.persist(subject);
+      notebookServer.broadcastNote(note);
+      notebookServer.broadcastNoteList(subject);
+    } catch (DuplicateNameException e) {
+      return new JsonResponse<>(Status.NOT_ACCEPTABLE, "Notebook with name " + noteName +
+              "already exists").build();
+    }
     return new JsonResponse<>(Status.CREATED, "", note.getId()).build();
   }
 
@@ -311,6 +323,7 @@ public Response deleteNote(@PathParam("notebookId") String notebookId) throws IO
    * @param notebookId ID of Notebook
    * @return JSON with status.CREATED
    * @throws IOException, CloneNotSupportedException, IllegalArgumentException
+   * @throws DuplicateNameException 
    */
   @POST
   @Path("{notebookId}")
@@ -318,15 +331,21 @@ public Response deleteNote(@PathParam("notebookId") String notebookId) throws IO
   public Response cloneNote(@PathParam("notebookId") String notebookId, String message)
       throws IOException, CloneNotSupportedException, IllegalArgumentException {
     LOG.info("clone notebook by JSON {}", message);
-    NewNotebookRequest request = gson.fromJson(message, NewNotebookRequest.class);
     String newNoteName = null;
-    if (request != null) {
-      newNoteName = request.getName();
+    Note newNote;
+    try {
+      NewNotebookRequest request = gson.fromJson(message, NewNotebookRequest.class);
+      if (request != null) {
+        newNoteName = request.getName();
+      }
+      AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
+      newNote = notebook.cloneNote(notebookId, newNoteName, subject);
+      notebookServer.broadcastNote(newNote);
+      notebookServer.broadcastNoteList(subject);
+    } catch (DuplicateNameException e) {
+      return new JsonResponse<>(Status.NOT_ACCEPTABLE, "Note with name " + newNoteName +
+              "already exists").build();
     }
-    AuthenticationInfo subject = new AuthenticationInfo(SecurityUtils.getPrincipal());
-    Note newNote = notebook.cloneNote(notebookId, newNoteName, subject);
-    notebookServer.broadcastNote(newNote);
-    notebookServer.broadcastNoteList(subject);
     return new JsonResponse<>(Status.CREATED, "", newNote.getId()).build();
   }
 
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 10c94107700..9ab9b36ed65 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
@@ -28,6 +28,7 @@
 import org.apache.zeppelin.display.AngularObject;
 import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.display.AngularObjectRegistryListener;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.helium.ApplicationEventListener;
 import org.apache.zeppelin.helium.HeliumPackage;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
@@ -640,20 +641,23 @@ private void createNote(NotebookSocket conn, HashSet<String> userAndRoles,
                           Notebook notebook, Message message)
       throws IOException {
     AuthenticationInfo subject = new AuthenticationInfo(message.principal);
-    Note note = notebook.createNote(subject);
-    note.addParagraph(); // it's an empty note. so add one paragraph
+    String noteName = null;
     if (message != null) {
-      String noteName = (String) message.get("name");
-      if (noteName == null || noteName.isEmpty()){
-        noteName = "Note " + note.getId();
-      }
-      note.setName(noteName);
+      noteName = (String) message.get("name");
     }
+    try {
+      Note note = notebook.createNote(subject, noteName);
+    
+      note.addParagraph(); // it's an empty note. so add one paragraph
 
-    note.persist(subject);
-    addConnectionToNote(note.getId(), (NotebookSocket) conn);
-    conn.send(serializeMessage(new Message(OP.NEW_NOTE).put("note", note)));
-    broadcastNoteList(subject);
+      note.persist(subject);
+      addConnectionToNote(note.getId(), (NotebookSocket) conn);
+      conn.send(serializeMessage(new Message(OP.NEW_NOTE).put("note", note)));
+      broadcastNoteList(subject);
+    } catch (DuplicateNameException dne) {
+      conn.send(serializeMessage(new Message(OP.ERROR_DIALOG).put("info", 
+        "Please provide a unique notebook name")));
+    }
   }
 
   private void removeNote(NotebookSocket conn, HashSet<String> userAndRoles,
@@ -710,31 +714,42 @@ private void updateParagraph(NotebookSocket conn, HashSet<String> userAndRoles,
 
   private void cloneNote(NotebookSocket conn, HashSet<String> userAndRoles,
                          Notebook notebook, Message fromMessage)
-      throws IOException, CloneNotSupportedException {
-    String noteId = getOpenNoteId(conn);
-    String name = (String) fromMessage.get("name");
-    Note newNote = notebook.cloneNote(noteId, name, new AuthenticationInfo(fromMessage.principal));
-    AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal);
-    addConnectionToNote(newNote.getId(), (NotebookSocket) conn);
-    conn.send(serializeMessage(new Message(OP.NEW_NOTE).put("note", newNote)));
-    broadcastNoteList(subject);
+      throws IOException, CloneNotSupportedException, IllegalArgumentException {
+    try {
+      String noteId = getOpenNoteId(conn);
+      String name = (String) fromMessage.get("name");
+      Note newNote = notebook.cloneNote(noteId, name, 
+        new AuthenticationInfo(fromMessage.principal));
+      AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal);
+      addConnectionToNote(newNote.getId(), (NotebookSocket) conn);
+      conn.send(serializeMessage(new Message(OP.NEW_NOTE).put("note", newNote)));
+      broadcastNoteList(subject);
+    } catch (DuplicateNameException dne) {
+      conn.send(serializeMessage(new Message(OP.ERROR_DIALOG).put("info", 
+              "Please provide a unique notebook name")));
+    }
   }
 
   protected Note importNote(NotebookSocket conn, HashSet<String> userAndRoles,
                             Notebook notebook, Message fromMessage)
       throws IOException {
     Note note = null;
-    if (fromMessage != null) {
-      String noteName = (String) ((Map) fromMessage.get("notebook")).get("name");
-      String noteJson = gson.toJson(fromMessage.get("notebook"));
-      AuthenticationInfo subject = null;
-      if (fromMessage.principal != null) {
-        subject = new AuthenticationInfo(fromMessage.principal);
+    try {
+      if (fromMessage != null) {
+        String noteName = (String) ((Map) fromMessage.get("notebook")).get("name");
+        String noteJson = gson.toJson(fromMessage.get("notebook"));
+        AuthenticationInfo subject = null;
+        if (fromMessage.principal != null) {
+          subject = new AuthenticationInfo(fromMessage.principal);
+        }
+        note = notebook.importNote(noteJson, noteName, subject);
+        note.persist(subject);
+        broadcastNote(note);
+        broadcastNoteList(subject);
       }
-      note = notebook.importNote(noteJson, noteName, subject);
-      note.persist(subject);
-      broadcastNote(note);
-      broadcastNoteList(subject);
+    } catch (DuplicateNameException dne) {
+      conn.send(serializeMessage(new Message(OP.IMPORT_ERROR_DIALOG).put("info", 
+              "Please provide a unique notebook name")));
     }
     return note;
   }
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
index eb080fe9605..622bb363b92 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -462,5 +462,7 @@ protected Matcher<? super HttpMethodBase> isAllowed() {
   protected Matcher<? super HttpMethodBase> isNotAllowed() {
     return responsesWith(405);
   }
+  
+  protected Matcher<? super HttpMethodBase> isNotAcceptable() { return responsesWith(406); }
 
 }
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
index c767eb05786..498027067f7 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
@@ -25,6 +25,7 @@
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
 import org.apache.zeppelin.notebook.Note;
 import org.apache.zeppelin.notebook.Paragraph;
@@ -47,6 +48,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class InterpreterRestApiTest extends AbstractTestRestApi {
   Gson gson = new Gson();
+  private final String EMPTY_STRING = "";
 
   @BeforeClass
   public static void init() throws Exception {
@@ -129,9 +131,9 @@ public void testSettingsCreateWithEmptyJson() throws IOException {
   }
 
   @Test
-  public void testInterpreterAutoBinding() throws IOException {
+  public void testInterpreterAutoBinding() throws IOException, DuplicateNameException {
     // create note
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     // check interpreter is binded
     GetMethod get = httpGet("/notebook/interpreter/bind/" + note.getId());
@@ -148,9 +150,9 @@ public void testInterpreterAutoBinding() throws IOException {
   }
 
   @Test
-  public void testInterpreterRestart() throws IOException, InterruptedException {
+  public void testInterpreterRestart() throws IOException, InterruptedException, DuplicateNameException {
     // create new note
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     note.addParagraph();
     Paragraph p = note.getLastParagraph();
     Map config = p.getConfig();
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
index d7f55f54744..0d2054295fc 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
@@ -24,6 +24,7 @@
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.notebook.Note;
 import org.apache.zeppelin.notebook.NotebookAuthorization;
 import org.apache.zeppelin.notebook.NotebookAuthorizationInfoSaving;
@@ -49,6 +50,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class NotebookRestApiTest extends AbstractTestRestApi {
   Gson gson = new Gson();
+  private final String EMPTY_STRING = "";
 
   @BeforeClass
   public static void init() throws Exception {
@@ -61,8 +63,8 @@ public static void destroy() throws Exception {
   }
 
   @Test
-  public void testPermissions() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(null);
+  public void testPermissions() throws IOException, DuplicateNameException {
+    Note note1 = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     // Set only readers
     String jsonRequest = "{\"readers\":[\"admin-team\"],\"owners\":[]," +
             "\"writers\":[]}";
@@ -85,7 +87,7 @@ public void testPermissions() throws IOException {
     get.releaseConnection();
 
 
-    Note note2 = ZeppelinServer.notebook.createNote(null);
+    Note note2 = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     // Set only writers
     jsonRequest = "{\"readers\":[],\"owners\":[]," +
             "\"writers\":[\"admin-team\"]}";
@@ -125,8 +127,8 @@ public void testPermissions() throws IOException {
   }
 
   @Test
-  public void testGetNoteParagraphJobStatus() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(null);
+  public void testGetNoteParagraphJobStatus() throws IOException, DuplicateNameException {
+    Note note1 = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     note1.addParagraph();
 
     String paragraphId = note1.getLastParagraph().getId();
@@ -147,8 +149,8 @@ public void testGetNoteParagraphJobStatus() throws IOException {
   }
 
   @Test
-  public void testCloneNotebook() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(null);
+  public void testCloneNotebook() throws IOException, DuplicateNameException {
+    Note note1 = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     PostMethod post = httpPost("/notebook/" + note1.getId(), "");
     LOG.info("testCloneNotebook response\n" + post.getResponseBodyAsString());
     assertThat(post, isCreated());
@@ -171,6 +173,33 @@ public void testCloneNotebook() throws IOException {
     ZeppelinServer.notebook.removeNote(clonedNotebookId, null);
 
   }
+  
+  @Test
+  public void testCloneNotebookWithSameName() throws IOException, DuplicateNameException {
+    String noteName = "Test_Note";
+    String jsonRequest = "{\"name\":\"" + noteName + "\"}";
+    Note note1 = ZeppelinServer.notebook.createNote(null, noteName);
+    PostMethod post = httpPost("/notebook/" + note1.getId(), jsonRequest);
+    LOG.info("testCloneNotebookWithSameName response\n" + post.getResponseBodyAsString());
+    assertThat(post, isNotAcceptable());
+
+    //cleanup
+    ZeppelinServer.notebook.removeNote(note1.getId(), null);
+  }
+  
+  @Test
+  public void testCreateNotebookWithSameName() throws IOException, DuplicateNameException {
+    String noteName = "Test_Note";
+    Note note1 = ZeppelinServer.notebook.createNote(null, noteName);
+    String jsonRequest = "{\"name\":\"" + noteName + "\"}";
+    PostMethod post = httpPost("/notebook/", jsonRequest);
+    LOG.info("testCloneNotebookWithSameName response\n" + post.getResponseBodyAsString());
+    assertThat(post, isNotAcceptable());
+    post.releaseConnection();
+
+    //cleanup
+    ZeppelinServer.notebook.removeNote(note1.getId(), null);
+  }
 }
 
 
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
index 4390d74b495..9a450248882 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
@@ -27,6 +27,7 @@
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
 import org.apache.zeppelin.notebook.Note;
 import org.apache.zeppelin.notebook.Paragraph;
@@ -50,6 +51,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ZeppelinRestApiTest extends AbstractTestRestApi {
   Gson gson = new Gson();
+  private final String EMPTY_STRING = "";
 
   @BeforeClass
   public static void init() throws Exception {
@@ -74,10 +76,10 @@ public void getApiRoot() throws IOException {
   }
 
   @Test
-  public void testGetNotebookInfo() throws IOException {
+  public void testGetNotebookInfo() throws IOException, DuplicateNameException {
     LOG.info("testGetNotebookInfo");
     // Create note to get info
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName("note");
     Paragraph paragraph = note.addParagraph();
@@ -186,10 +188,10 @@ private void testNotebookCreate(String noteName) throws IOException {
   }
 
   @Test
-  public void testDeleteNote() throws IOException {
+  public void testDeleteNote() throws IOException, DuplicateNameException {
     LOG.info("testDeleteNote");
     //Create note and get ID
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     String noteId = note.getId();
     testDeleteNotebook(noteId);
   }
@@ -203,9 +205,9 @@ public void testDeleteNoteBadId() throws IOException {
 
 
   @Test
-  public void testExportNotebook() throws IOException {
+  public void testExportNotebook() throws IOException, DuplicateNameException {
     LOG.info("testExportNotebook");
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName("source note for export");
     Paragraph paragraph = note.addParagraph();
@@ -233,12 +235,12 @@ public void testExportNotebook() throws IOException {
   }
 
   @Test
-  public void testImportNotebook() throws IOException {
+  public void testImportNotebook() throws IOException, DuplicateNameException {
     Map<String, Object> resp;
     String noteName = "source note for import";
     LOG.info("testImortNotebook");
     // create test notebook
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName(noteName);
     Paragraph paragraph = note.addParagraph();
@@ -252,20 +254,9 @@ public void testImportNotebook() throws IOException {
     String oldJson = getNoteContent(sourceNoteID);
     // call notebook post
     PostMethod importPost = httpPost("/notebook/import/", oldJson);
-    assertThat(importPost, isCreated());
-    resp =
-        gson.fromJson(importPost.getResponseBodyAsString(),
-            new TypeToken<Map<String, Object>>() {}.getType());
-    String importId = (String) resp.get("body");
-
-    assertNotNull("Did not get back a notebook id in body", importId);
-    Note newNote = ZeppelinServer.notebook.getNote(importId);
-    assertEquals("Compare note names", noteName, newNote.getName());
-    assertEquals("Compare paragraphs count", note.getParagraphs().size(), newNote.getParagraphs()
-        .size());
+    assertThat(importPost, isNotAcceptable());
     // cleanup
     ZeppelinServer.notebook.removeNote(note.getId(), null);
-    ZeppelinServer.notebook.removeNote(newNote.getId(), null);
     importPost.releaseConnection();
   }
 
@@ -297,10 +288,11 @@ private void testDeleteNotebook(String notebookId) throws IOException {
   }
 
   @Test
-  public void testCloneNotebook() throws IOException, CloneNotSupportedException, IllegalArgumentException {
+  public void testCloneNotebook() throws IOException, CloneNotSupportedException, 
+      IllegalArgumentException, DuplicateNameException {
     LOG.info("testCloneNotebook");
     // Create note to clone
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName("source note for clone");
     Paragraph paragraph = note.addParagraph();
@@ -346,10 +338,10 @@ public void testListNotebooks() throws IOException {
   }
 
   @Test
-  public void testNoteJobs() throws IOException, InterruptedException {
+  public void testNoteJobs() throws IOException, InterruptedException, DuplicateNameException {
     LOG.info("testNoteJobs");
     // Create note to run test.
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName("note for run test");
     Paragraph paragraph = note.addParagraph();
@@ -401,10 +393,11 @@ public void testNoteJobs() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testGetNotebookJob() throws IOException, InterruptedException {
+  public void testGetNotebookJob() throws IOException, InterruptedException, 
+      DuplicateNameException {
     LOG.info("testGetNotebookJob");
     // Create note to run test.
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName("note for run test");
     Paragraph paragraph = note.addParagraph();
@@ -454,10 +447,11 @@ public void testGetNotebookJob() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testRunParagraphWithParams() throws IOException, InterruptedException {
+  public void testRunParagraphWithParams() throws IOException, InterruptedException, 
+      DuplicateNameException {
     LOG.info("testRunParagraphWithParams");
     // Create note to run test.
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     assertNotNull("can't create new note", note);
     note.setName("note for run test");
     Paragraph paragraph = note.addParagraph();
@@ -499,9 +493,9 @@ public void testRunParagraphWithParams() throws IOException, InterruptedExceptio
   }
 
   @Test
-  public void testCronJobs() throws InterruptedException, IOException{
+  public void testCronJobs() throws InterruptedException, IOException, DuplicateNameException{
     // create a note and a paragraph
-    Note note = ZeppelinServer.notebook.createNote(null);
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     note.setName("note for run test");
     Paragraph paragraph = note.addParagraph();
@@ -549,8 +543,8 @@ public void testCronJobs() throws InterruptedException, IOException{
   }
 
   @Test
-  public void testRegressionZEPPELIN_527() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(null);
+  public void testRegressionZEPPELIN_527() throws IOException, DuplicateNameException {
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     note.setName("note for run test");
     Paragraph paragraph = note.addParagraph();
@@ -571,8 +565,8 @@ public void testRegressionZEPPELIN_527() throws IOException {
   }
 
   @Test
-  public void testInsertParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(null);
+  public void testInsertParagraph() throws IOException, DuplicateNameException {
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     String jsonRequest = "{\"title\": \"title1\", \"text\": \"text1\"}";
     PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest);
@@ -611,8 +605,8 @@ public void testInsertParagraph() throws IOException {
   }
 
   @Test
-  public void testGetParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(null);
+  public void testGetParagraph() throws IOException, DuplicateNameException {
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     Paragraph p = note.addParagraph();
     p.setTitle("hello");
@@ -640,8 +634,8 @@ public void testGetParagraph() throws IOException {
   }
 
   @Test
-  public void testMoveParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(null);
+  public void testMoveParagraph() throws IOException, DuplicateNameException {
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     Paragraph p = note.addParagraph();
     p.setTitle("title1");
@@ -672,8 +666,8 @@ public void testMoveParagraph() throws IOException {
   }
 
   @Test
-  public void testDeleteParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(null);
+  public void testDeleteParagraph() throws IOException, DuplicateNameException {
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
     Paragraph p = note.addParagraph();
     p.setTitle("title1");
@@ -693,7 +687,7 @@ public void testDeleteParagraph() throws IOException {
   }
 
   @Test
-  public void testSearch() throws IOException {
+  public void testSearch() throws IOException, DuplicateNameException {
     Map<String, String> body;
 
     GetMethod getSecurityTicket = httpGet("/security/ticket");
@@ -705,12 +699,12 @@ public void testSearch() throws IOException {
     String username = body.get("principal");
     getSecurityTicket.releaseConnection();
 
-    Note note1 = ZeppelinServer.notebook.createNote(null);
+    Note note1 = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     String jsonRequest = "{\"title\": \"title1\", \"text\": \"ThisIsToTestSearchMethodWithPermissions 1\"}";
     PostMethod postNotebookText = httpPost("/notebook/" + note1.getId() + "/paragraph", jsonRequest);
     postNotebookText.releaseConnection();
 
-    Note note2 = ZeppelinServer.notebook.createNote(null);
+    Note note2 = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     jsonRequest = "{\"title\": \"title1\", \"text\": \"ThisIsToTestSearchMethodWithPermissions 2\"}";
     postNotebookText = httpPost("/notebook/" + note2.getId() + "/paragraph", jsonRequest);
     postNotebookText.releaseConnection();
@@ -757,8 +751,8 @@ public void testSearch() throws IOException {
   }
 
   @Test
-  public void testTitleSearch() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(null);
+  public void testTitleSearch() throws IOException, DuplicateNameException {
+    Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
     String jsonRequest = "{\"title\": \"testTitleSearchOfParagraph\", \"text\": \"ThisIsToTestSearchMethodWithTitle \"}";
     PostMethod postNotebookText = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest);
     postNotebookText.releaseConnection();
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
index 5084ae73719..dede5979761 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
 import org.apache.zeppelin.notebook.Note;
@@ -43,6 +44,7 @@
  */
 public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     Gson gson = new Gson();
+    private final String EMPTY_STRING = "";
 
     @BeforeClass
     public static void init() throws Exception {
@@ -67,9 +69,9 @@ private void waitForFinish(Paragraph p) {
     }
 
     @Test
-    public void basicRDDTransformationAndActionTest() throws IOException {
+    public void basicRDDTransformationAndActionTest() throws IOException, DuplicateNameException {
         // create new note
-        Note note = ZeppelinServer.notebook.createNote(null);
+        Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
 
         // run markdown paragraph, again
         Paragraph p = note.addParagraph();
@@ -85,9 +87,9 @@ public void basicRDDTransformationAndActionTest() throws IOException {
     }
 
     @Test
-    public void sparkSQLTest() throws IOException {
+    public void sparkSQLTest() throws IOException, DuplicateNameException {
         // create new note
-        Note note = ZeppelinServer.notebook.createNote(null);
+        Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
         int sparkVersion = getSparkVersionNumber(note);
         // DataFrame API is available from spark 1.3
         if (sparkVersion >= 13) {
@@ -136,9 +138,9 @@ public void sparkSQLTest() throws IOException {
     }
 
     @Test
-    public void sparkRTest() throws IOException {
+    public void sparkRTest() throws IOException, DuplicateNameException {
       // create new note
-      Note note = ZeppelinServer.notebook.createNote(null);
+      Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
       int sparkVersion = getSparkVersionNumber(note);
 
       if (isSparkR() && sparkVersion >= 14) {   // sparkr supported from 1.4.0
@@ -175,9 +177,9 @@ public void sparkRTest() throws IOException {
     }
 
     @Test
-    public void pySparkTest() throws IOException {
+    public void pySparkTest() throws IOException, DuplicateNameException {
         // create new note
-        Note note = ZeppelinServer.notebook.createNote(null);
+        Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
         note.setName("note");
         int sparkVersion = getSparkVersionNumber(note);
 
@@ -265,9 +267,9 @@ public void pySparkTest() throws IOException {
     }
 
     @Test
-    public void pySparkAutoConvertOptionTest() throws IOException {
+    public void pySparkAutoConvertOptionTest() throws IOException, DuplicateNameException {
         // create new note
-        Note note = ZeppelinServer.notebook.createNote(null);
+        Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
         note.setName("note");
 
         int sparkVersionNumber = getSparkVersionNumber(note);
@@ -295,9 +297,9 @@ public void pySparkAutoConvertOptionTest() throws IOException {
     }
 
     @Test
-    public void zRunTest() throws IOException {
+    public void zRunTest() throws IOException, DuplicateNameException {
         // create new note
-        Note note = ZeppelinServer.notebook.createNote(null);
+        Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
         Paragraph p0 = note.addParagraph();
         Map config0 = p0.getConfig();
         config0.put("enabled", true);
@@ -327,9 +329,9 @@ public void zRunTest() throws IOException {
     }
 
     @Test
-    public void pySparkDepLoaderTest() throws IOException {
+    public void pySparkDepLoaderTest() throws IOException, DuplicateNameException {
         // create new note
-        Note note = ZeppelinServer.notebook.createNote(null);
+        Note note = ZeppelinServer.notebook.createNote(null, EMPTY_STRING);
         int sparkVersionNumber = getSparkVersionNumber(note);
 
         if (isPyspark() && sparkVersionNumber >= 14) {
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
index 01a24e2e1de..fb1d1bbca65 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
@@ -21,6 +21,7 @@
 import org.apache.zeppelin.display.AngularObject;
 import org.apache.zeppelin.display.AngularObjectBuilder;
 import org.apache.zeppelin.display.AngularObjectRegistry;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
 import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
@@ -92,9 +93,9 @@ public void checkInvalidOrigin(){
   }
 
   @Test
-  public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() throws IOException {
+  public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() throws IOException, DuplicateNameException {
     // create a notebook
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, "");
 
     // get reference to interpreterGroup
     InterpreterGroup interpreterGroup = null;
@@ -148,7 +149,7 @@ public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() thr
   }
 
   @Test
-  public void testImportNotebook() throws IOException {
+  public void testImportNotebook() throws IOException, DuplicateNameException {
     String msg = "{\"op\":\"IMPORT_NOTE\",\"data\":" +
         "{\"notebook\":{\"paragraphs\": [{\"text\": \"Test " +
         "paragraphs import\",\"config\":{},\"settings\":{}}]," +
diff --git a/zeppelin-web/src/components/noteName-create/note-name-dialog.html b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
index 1f90085a491..f2afb2bcae0 100644
--- a/zeppelin-web/src/components/noteName-create/note-name-dialog.html
+++ b/zeppelin-web/src/components/noteName-create/note-name-dialog.html
@@ -29,11 +29,12 @@ <h4 class="modal-title" ng-show="notenamectrl.clone">Clone note</h4>
               id="noteName" ng-model="note.notename" ng-enter="notenamectrl.handleNameEnter()"/>
           </div>
           Use '/' to create folders. Example: /NoteDirA/Notebook1
+          <div class="text-danger" ng-show="notenamectrl.error">Please provide a unique Notebook name</div>
         </div>
         <div class="modal-footer">
           <button type="button" id="createNoteButton"
                   class="btn btn-default"
-                  data-dismiss="modal" ng-click="notenamectrl.createNote()">
+                  ng-click="notenamectrl.createNote()">
             <span ng-show="!notenamectrl.clone">Create Note</span>
             <span ng-show="notenamectrl.clone">Clone Note</span>
           </button>
diff --git a/zeppelin-web/src/components/noteName-create/notename.controller.js b/zeppelin-web/src/components/noteName-create/notename.controller.js
index 4f85dda7f1e..da63d486cb8 100644
--- a/zeppelin-web/src/components/noteName-create/notename.controller.js
+++ b/zeppelin-web/src/components/noteName-create/notename.controller.js
@@ -18,6 +18,7 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, not
                                                                       $routeParams, websocketMsgSrv) {
   var vm = this;
   vm.clone = false;
+  vm.error = false;
   vm.notes = notebookListDataFactory;
   vm.websocketMsgSrv = websocketMsgSrv;
   $scope.note = {};
@@ -37,6 +38,7 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, not
   };
 
   vm.preVisible = function(clone) {
+    vm.error = false;
     $scope.note.notename = vm.newNoteName();
     vm.clone = clone;
     $scope.$apply();
@@ -56,4 +58,8 @@ angular.module('zeppelinWebApp').controller('NotenameCtrl', function($scope, not
     return 'Untitled Note ' + newCount;
   };
 
+  $scope.$on('errorDialog', function(event, data) {
+    vm.error = true;
+  });
+
 });
diff --git a/zeppelin-web/src/components/noteName-import/note-import-dialog.html b/zeppelin-web/src/components/noteName-import/note-import-dialog.html
index 4922cb89058..a47e21a4b7d 100644
--- a/zeppelin-web/src/components/noteName-import/note-import-dialog.html
+++ b/zeppelin-web/src/components/noteName-import/note-import-dialog.html
@@ -12,7 +12,7 @@
 limitations under the License.
 -->
 
-  <div id="noteImportModal" class="modal fade" role="dialog"
+  <div id="noteImportModal" class="modal fade" role="dialog" modalvisible previsiblecallback="noteimportctrl.preVisible"
        tabindex="-1">
     <div class="modal-dialog">
 
@@ -57,7 +57,7 @@ <h4 class="modal-title">Import new note</h4>
             <input placeholder="Note name" type="text" class="form-control" id="noteImportUrl"
                    ng-model="note.importUrl" />
           </div>
-
+          <div class="text-danger" ng-show="noteimportctrl.error">Please provide a unique Notebook name</div>
         </div>
         <div class="modal-footer">
           <div ng-show="note.step2">
diff --git a/zeppelin-web/src/components/noteName-import/notenameImport.controller.js b/zeppelin-web/src/components/noteName-import/notenameImport.controller.js
index dea3dd32b22..a2d8082eecc 100644
--- a/zeppelin-web/src/components/noteName-import/notenameImport.controller.js
+++ b/zeppelin-web/src/components/noteName-import/notenameImport.controller.js
@@ -16,6 +16,7 @@
 
 angular.module('zeppelinWebApp').controller('NoteImportCtrl', function($scope, $timeout, websocketMsgSrv) {
   var vm = this;
+  vm.error = false;
   $scope.note = {};
   $scope.note.step1 = true;
   $scope.note.step2 = false;
@@ -62,6 +63,11 @@ angular.module('zeppelinWebApp').controller('NoteImportCtrl', function($scope, $
     $scope.note.step2 = false;
   };
 
+  vm.preVisible = function() {
+    vm.error = false;
+    $scope.$apply();
+  };
+
   vm.importNote = function() {
     $scope.note.errorText = '';
     if ($scope.note.importUrl) {
@@ -110,4 +116,8 @@ angular.module('zeppelinWebApp').controller('NoteImportCtrl', function($scope, $
     vm.resetFlags();
     angular.element('#noteImportModal').modal('hide');
   });
+  $scope.$on('importErrorDialog', function(event, data) {
+    vm.resetFlags();
+    vm.error = true;
+  });
 });
diff --git a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
index 6e0bbbae295..133ea609e8c 100644
--- a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
+++ b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
@@ -57,6 +57,7 @@ angular.module('zeppelinWebApp').factory('websocketEvents',
     if (op === 'NOTE') {
       $rootScope.$broadcast('setNoteContent', data.note);
     } else if (op === 'NEW_NOTE') {
+      angular.element('#noteNameModal').modal('hide');
       $location.path('/notebook/' + data.note.id);
     } else if (op === 'NOTES_INFO') {
       $rootScope.$broadcast('setNoteMenu', data.notes);
@@ -132,6 +133,10 @@ angular.module('zeppelinWebApp').factory('websocketEvents',
             }
           }]
       });
+    } else if (op === 'ERROR_DIALOG') {
+      $rootScope.$broadcast('errorDialog', data);
+    } else if (op === 'IMPORT_ERROR_DIALOG') {
+      $rootScope.$broadcast('importErrorDialog', data);
     }
   });
 
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/exception/DuplicateNameException.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/exception/DuplicateNameException.java
new file mode 100644
index 00000000000..41ae748e66c
--- /dev/null
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/exception/DuplicateNameException.java
@@ -0,0 +1,32 @@
+/*
+ * 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.exception;
+
+/**
+ * Custom Exception for duplicate Notebook name
+ */
+public class DuplicateNameException extends Exception{
+  private static final long serialVersionUID = -807097165104866579L;
+
+  public DuplicateNameException() {
+    super();
+  }
+
+  public DuplicateNameException(String message) {
+    super(message);
+  }
+}
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
index d961ac033b0..089f7b31b79 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -32,30 +32,11 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Sets;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.stream.JsonReader;
-import org.apache.commons.codec.binary.StringUtils;
-import org.quartz.CronScheduleBuilder;
-import org.quartz.CronTrigger;
-import org.quartz.JobBuilder;
-import org.quartz.JobDetail;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.JobKey;
-import org.quartz.SchedulerException;
-import org.quartz.TriggerBuilder;
-import org.quartz.impl.StdSchedulerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 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.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterFactory;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
@@ -69,6 +50,25 @@
 import org.apache.zeppelin.search.SearchService;
 import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.user.Credentials;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.CronTrigger;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.JobKey;
+import org.quartz.SchedulerException;
+import org.quartz.TriggerBuilder;
+import org.quartz.impl.StdSchedulerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Sets;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.stream.JsonReader;
 
 /**
  * Collection of Notes.
@@ -135,15 +135,31 @@ public Notebook(ZeppelinConfiguration conf, NotebookRepo notebookRepo,
    * Create new note.
    *
    * @throws IOException
+   * @throws DuplicateNameException 
    */
-  public Note createNote(AuthenticationInfo subject) throws IOException {
+  public Note createNote(AuthenticationInfo subject, String noteName) throws IOException,
+      DuplicateNameException {
     Note note;
-    if (conf.getBoolean(ConfVars.ZEPPELIN_NOTEBOOK_AUTO_INTERPRETER_BINDING)) {
-      note = createNote(replFactory.getDefaultInterpreterSettingList(), subject);
-    } else {
-      note = createNote(null, subject);
+    List<Note> notes;
+    try {
+      notes = getAllNotes();
+      if (noteName != null && !noteName.isEmpty()) {
+        checkNoteName(notes, noteName);
+      }
+      if (conf.getBoolean(ConfVars.ZEPPELIN_NOTEBOOK_AUTO_INTERPRETER_BINDING)) {
+        note = createNote(replFactory.getDefaultInterpreterSettingList(), subject);
+      } else {
+        note = createNote(null, subject);
+      }
+      if (noteName == null || noteName.trim().isEmpty()) {
+        noteName = "Note " + note.getId();
+        checkNoteName(notes, noteName);
+      }
+      note.setName(noteName);
+      notebookIndex.addIndexDoc(note);
+    } catch (DuplicateNameException dne) {
+      throw new DuplicateNameException();
     }
-    notebookIndex.addIndexDoc(note);
     return note;
   }
 
@@ -199,9 +215,10 @@ public String exportNote(String noteId) throws IOException, IllegalArgumentExcep
    * @param noteName   - the name of the new note
    * @return notebook ID
    * @throws IOException
+   * @throws DuplicateNameException 
    */
   public Note importNote(String sourceJson, String noteName, AuthenticationInfo subject)
-      throws IOException {
+      throws IOException, DuplicateNameException {
     GsonBuilder gsonBuilder = new GsonBuilder();
     gsonBuilder.setPrettyPrinting();
 
@@ -212,11 +229,10 @@ public Note importNote(String sourceJson, String noteName, AuthenticationInfo su
     Note newNote;
     try {
       Note oldNote = gson.fromJson(reader, Note.class);
-      newNote = createNote(subject);
-      if (noteName != null)
-        newNote.setName(noteName);
-      else
-        newNote.setName(oldNote.getName());
+      if (noteName == null || noteName.isEmpty()) {
+        noteName = oldNote.getName();
+      }
+      newNote = createNote(subject, noteName);
       List<Paragraph> paragraphs = oldNote.getParagraphs();
       for (Paragraph p : paragraphs) {
         newNote.addCloneParagraph(p);
@@ -238,20 +254,17 @@ public Note importNote(String sourceJson, String noteName, AuthenticationInfo su
    * @param newNoteName  - the name of the new note
    * @return noteId
    * @throws IOException, CloneNotSupportedException, IllegalArgumentException
+   * @throws DuplicateNameException 
    */
   public Note cloneNote(String sourceNoteID, String newNoteName, AuthenticationInfo subject)
-      throws IOException, CloneNotSupportedException, IllegalArgumentException {
+      throws IOException, CloneNotSupportedException, IllegalArgumentException,
+      DuplicateNameException {
 
     Note sourceNote = getNote(sourceNoteID);
     if (sourceNote == null) {
       throw new IllegalArgumentException(sourceNoteID + "not found");
     }
-    Note newNote = createNote(subject);
-    if (newNoteName != null) {
-      newNote.setName(newNoteName);
-    } else {
-      newNote.setName("Note " + newNote.getId());
-    }
+    Note newNote = createNote(subject, newNoteName);
     // Copy the interpreter bindings
     List<String> boundInterpreterSettingsIds = getBindedInterpreterSettingsIds(sourceNote.getId());
     bindInterpretersToNote(newNote.getId(), boundInterpreterSettingsIds);
@@ -851,6 +864,14 @@ public void refreshCron(String id) {
       }
     }
   }
+  
+  private void checkNoteName(List<Note> notes, String noteName) throws DuplicateNameException {
+    for (Note entry : notes) {
+      if (entry.getName().equals(noteName)){
+        throw new DuplicateNameException();
+      }
+    }
+  }
 
   private void removeCron(String id) {
     try {
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 7807abba416..2142085777a 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
@@ -289,9 +289,13 @@ protected Object jobRun() throws Throwable {
       logger.error("Can not find interpreter name " + repl);
       throw new RuntimeException("Can not find interpreter for " + getRequiredReplName());
     }
-
+    InterpreterSetting intp = getInterpreterSettingById(repl.getInterpreterGroup().getId());
+    while (intp.getStatus().equals(
+      org.apache.zeppelin.interpreter.InterpreterSetting.Status.DOWNLOADING_DEPENDENCIES)) {
+      Thread.sleep(200);
+      intp = getInterpreterSettingById(repl.getInterpreterGroup().getId());
+    }
     if (this.noteHasUser() && this.noteHasInterpreters()) {
-      InterpreterSetting intp = getInterpreterSettingById(repl.getInterpreterGroup().getId());
       if (intp != null &&
         interpreterHasUser(intp) &&
         isUserAuthorizedToAccessInterpreter(intp.getOption()) == false) {
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java
index 2aded60ee40..d5d305a8e0b 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/socket/Message.java
@@ -140,7 +140,9 @@ public static enum OP {
                                   // @param noteID
                                   // @param selectedSettingIds
     INTERPRETER_BINDINGS,         // [s-c] interpreter bindings
-    ERROR_INFO                    // [s-c] error information to be sent
+    ERROR_INFO,                   // [s-c] error information to be sent
+    ERROR_DIALOG,
+    IMPORT_ERROR_DIALOG
   }
 
   public OP op;
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
index b32b3d8feb2..612722d81d8 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/helium/HeliumApplicationFactoryTest.java
@@ -19,6 +19,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.dep.DependencyResolver;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.*;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
@@ -50,6 +51,7 @@ public class HeliumApplicationFactoryTest implements JobListenerFactory {
   private VFSNotebookRepo notebookRepo;
   private Notebook notebook;
   private HeliumApplicationFactory heliumAppFactory;
+  private final String NOTE_NAME = "Note";
 
   @Before
   public void setUp() throws Exception {
@@ -122,7 +124,7 @@ public void tearDown() throws Exception {
 
   @Test
   public void testLoadRunUnloadApplication()
-      throws IOException, ApplicationException, InterruptedException {
+      throws IOException, ApplicationException, InterruptedException, DuplicateNameException {
     // given
     HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
         "name1",
@@ -131,7 +133,7 @@ public void testLoadRunUnloadApplication()
         HeliumTestApplication.class.getName(),
         new String[][]{});
 
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, NOTE_NAME);
     factory.setInterpreters(note1.getId(),factory.getDefaultInterpreterSettingList());
 
     Paragraph p1 = note1.addParagraph();
@@ -166,7 +168,7 @@ public void testLoadRunUnloadApplication()
   }
 
   @Test
-  public void testUnloadOnParagraphRemove() throws IOException {
+  public void testUnloadOnParagraphRemove() throws IOException, DuplicateNameException {
     // given
     HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
         "name1",
@@ -175,7 +177,7 @@ public void testUnloadOnParagraphRemove() throws IOException {
         HeliumTestApplication.class.getName(),
         new String[][]{});
 
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, NOTE_NAME);
     factory.setInterpreters(note1.getId(), factory.getDefaultInterpreterSettingList());
 
     Paragraph p1 = note1.addParagraph();
@@ -204,7 +206,7 @@ public void testUnloadOnParagraphRemove() throws IOException {
 
 
   @Test
-  public void testUnloadOnInterpreterUnbind() throws IOException {
+  public void testUnloadOnInterpreterUnbind() throws IOException, DuplicateNameException {
     // given
     HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
         "name1",
@@ -213,7 +215,7 @@ public void testUnloadOnInterpreterUnbind() throws IOException {
         HeliumTestApplication.class.getName(),
         new String[][]{});
 
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, NOTE_NAME);
     notebook.bindInterpretersToNote(note1.getId(), factory.getDefaultInterpreterSettingList());
 
     Paragraph p1 = note1.addParagraph();
@@ -241,9 +243,10 @@ public void testUnloadOnInterpreterUnbind() throws IOException {
   }
 
   @Test
-  public void testInterpreterUnbindOfNullReplParagraph() throws IOException {
+  public void testInterpreterUnbindOfNullReplParagraph() throws IOException, 
+      DuplicateNameException {
     // create note
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, NOTE_NAME);
 
     // add paragraph with invalid magic
     Paragraph p1 = note1.addParagraph();
@@ -263,7 +266,7 @@ public void testInterpreterUnbindOfNullReplParagraph() throws IOException {
 
 
   @Test
-  public void testUnloadOnInterpreterRestart() throws IOException {
+  public void testUnloadOnInterpreterRestart() throws IOException, DuplicateNameException {
     // given
     HeliumPackage pkg1 = new HeliumPackage(HeliumPackage.Type.APPLICATION,
         "name1",
@@ -272,7 +275,7 @@ public void testUnloadOnInterpreterRestart() throws IOException {
         HeliumTestApplication.class.getName(),
         new String[][]{});
 
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, NOTE_NAME);
     notebook.bindInterpretersToNote(note1.getId(), factory.getDefaultInterpreterSettingList());
     String mock1IntpSettingId = null;
     for (InterpreterSetting setting : notebook.getBindedInterpreterSettings(note1.getId())) {
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 18d343cdd0e..8f4e0d4a6ae 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
@@ -31,6 +31,7 @@
 import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
 import org.apache.zeppelin.dep.DependencyResolver;
 import org.apache.zeppelin.display.AngularObjectRegistry;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.*;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter2;
@@ -65,6 +66,7 @@ public class NotebookTest implements JobListenerFactory{
   private DependencyResolver depResolver;
   private NotebookAuthorization notebookAuthorization;
   private Credentials credentials;
+  private final String EMPTY_STRING = "";
 
   @Before
   public void setUp() throws Exception {
@@ -105,8 +107,8 @@ public void tearDown() throws Exception {
   }
 
   @Test
-  public void testSelectingReplImplementation() throws IOException {
-    Note note = notebook.createNote(null);
+  public void testSelectingReplImplementation() throws IOException, DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     // run with default repl
@@ -193,8 +195,9 @@ public void testReloadAllNotes() throws IOException {
   }
 
   @Test
-  public void testPersist() throws IOException, SchedulerException, RepositoryException {
-    Note note = notebook.createNote(null);
+  public void testPersist() throws IOException, SchedulerException, RepositoryException, 
+      DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
 
     // run with default repl
     Paragraph p1 = note.addParagraph();
@@ -211,9 +214,10 @@ public void testPersist() throws IOException, SchedulerException, RepositoryExce
   }
 
   @Test
-  public void testCreateNoteWithSubject() throws IOException, SchedulerException, RepositoryException {
+  public void testCreateNoteWithSubject() throws IOException, SchedulerException, RepositoryException,
+      DuplicateNameException {
     AuthenticationInfo subject = new AuthenticationInfo("user1");
-    Note note = notebook.createNote(subject);
+    Note note = notebook.createNote(subject, EMPTY_STRING);
 
     assertNotNull(notebook.getNotebookAuthorization().getOwners(note.getId()));
     assertEquals(1, notebook.getNotebookAuthorization().getOwners(note.getId()).size());
@@ -223,8 +227,9 @@ public void testCreateNoteWithSubject() throws IOException, SchedulerException,
   }
 
   @Test
-  public void testClearParagraphOutput() throws IOException, SchedulerException{
-    Note note = notebook.createNote(null);
+  public void testClearParagraphOutput() throws IOException, SchedulerException, 
+      DuplicateNameException{
+    Note note = notebook.createNote(null, EMPTY_STRING);
     Paragraph p1 = note.addParagraph();
     Map config = p1.getConfig();
     config.put("enabled", true);
@@ -241,8 +246,8 @@ public void testClearParagraphOutput() throws IOException, SchedulerException{
   }
 
   @Test
-  public void testRunAll() throws IOException {
-    Note note = notebook.createNote(null);
+  public void testRunAll() throws IOException, DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     // p1
@@ -279,9 +284,9 @@ public void testRunAll() throws IOException {
   }
 
   @Test
-  public void testSchedule() throws InterruptedException, IOException {
+  public void testSchedule() throws InterruptedException, IOException, DuplicateNameException {
     // create a note and a paragraph
-    Note note = notebook.createNote(null);
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     Paragraph p = note.addParagraph();
@@ -311,9 +316,10 @@ public void testSchedule() throws InterruptedException, IOException {
   }
 
   @Test
-  public void testAutoRestartInterpreterAfterSchedule() throws InterruptedException, IOException{
+  public void testAutoRestartInterpreterAfterSchedule() throws InterruptedException, IOException, 
+      DuplicateNameException{
     // create a note and a paragraph
-    Note note = notebook.createNote(null);
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
     
     Paragraph p = note.addParagraph();
@@ -364,8 +370,9 @@ public void testAutoRestartInterpreterAfterSchedule() throws InterruptedExceptio
 
   @Test
   public void testExportAndImportNote() throws IOException, CloneNotSupportedException,
-          InterruptedException, InterpreterException, SchedulerException, RepositoryException {
-    Note note = notebook.createNote(null);
+          InterruptedException, InterpreterException, SchedulerException, RepositoryException,
+          DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     final Paragraph p = note.addParagraph();
@@ -400,8 +407,9 @@ public void testExportAndImportNote() throws IOException, CloneNotSupportedExcep
 
   @Test
   public void testCloneNote() throws IOException, CloneNotSupportedException,
-      InterruptedException, InterpreterException, SchedulerException, RepositoryException {
-    Note note = notebook.createNote(null);
+      InterruptedException, InterpreterException, SchedulerException, RepositoryException, 
+      DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     final Paragraph p = note.addParagraph();
@@ -431,8 +439,8 @@ public void testCloneNote() throws IOException, CloneNotSupportedException,
 
   @Test
   public void testCloneNoteWithNoName() throws IOException, CloneNotSupportedException,
-      InterruptedException {
-    Note note = notebook.createNote(null);
+      InterruptedException, IllegalArgumentException, DuplicateNameException {
+    Note note = notebook.createNote(null, "Note");
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     Note cloneNote = notebook.cloneNote(note.getId(), null, null);
@@ -441,8 +449,8 @@ public void testCloneNoteWithNoName() throws IOException, CloneNotSupportedExcep
 
   @Test
   public void testCloneNoteWithExceptionResult() throws IOException, CloneNotSupportedException,
-      InterruptedException {
-    Note note = notebook.createNote(null);
+      InterruptedException, DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     final Paragraph p = note.addParagraph();
@@ -462,10 +470,37 @@ public void testCloneNoteWithExceptionResult() throws IOException, CloneNotSuppo
     assertEquals(cp.text, p.text);
     assertNull(cp.getResult());
   }
+  
+  @Test(expected = DuplicateNameException.class)
+  public void testCloneNoteWithDuplicateName() throws IOException, IllegalArgumentException, 
+      CloneNotSupportedException, DuplicateNameException {
+	//create note
+    Note note = notebook.createNote(null, "Note");
+    //clone note with same name
+    notebook.cloneNote(note.getId(), "Note", null);
+  }
+  
+  @Test(expected = DuplicateNameException.class)
+  public void testCreateNoteWithDuplicateName() throws IOException, DuplicateNameException {
+	//create note
+    Note note = notebook.createNote(null, "Note");
+    //create note with same name
+    notebook.createNote(null, "Note");
+  }
+  
+  @Test(expected = DuplicateNameException.class)
+  public void testImportNoteWithDuplicateName() throws IOException, DuplicateNameException {
+	//create note
+    Note note = notebook.createNote(null, "Note");
+    String exportedNoteJson = notebook.exportNote(note.getId());
+    //import note with same name
+    notebook.importNote(exportedNoteJson, "Note", null);
+  }
 
   @Test
-  public void testResourceRemovealOnParagraphNoteRemove() throws IOException {
-    Note note = notebook.createNote(null);
+  public void testResourceRemovealOnParagraphNoteRemove() throws IOException, 
+      DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
     for (InterpreterGroup intpGroup : InterpreterGroup.getAll()) {
       intpGroup.setResourcePool(new LocalResourcePool(intpGroup.getId()));
@@ -492,9 +527,9 @@ public void testResourceRemovealOnParagraphNoteRemove() throws IOException {
 
   @Test
   public void testAngularObjectRemovalOnNotebookRemove() throws InterruptedException,
-      IOException {
+      IOException, DuplicateNameException {
     // create a note and a paragraph
-    Note note = notebook.createNote(null);
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     AngularObjectRegistry registry = factory
@@ -525,9 +560,9 @@ public void testAngularObjectRemovalOnNotebookRemove() throws InterruptedExcepti
 
   @Test
   public void testAngularObjectRemovalOnParagraphRemove() throws InterruptedException,
-      IOException {
+      IOException, DuplicateNameException {
     // create a note and a paragraph
-    Note note = notebook.createNote(null);
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     AngularObjectRegistry registry = factory
@@ -558,9 +593,9 @@ public void testAngularObjectRemovalOnParagraphRemove() throws InterruptedExcept
 
   @Test
   public void testAngularObjectRemovalOnInterpreterRestart() throws InterruptedException,
-      IOException {
+      IOException, DuplicateNameException {
     // create a note and a paragraph
-    Note note = notebook.createNote(null);
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     AngularObjectRegistry registry = factory
@@ -584,9 +619,9 @@ public void testAngularObjectRemovalOnInterpreterRestart() throws InterruptedExc
   }
 
   @Test
-  public void testPermissions() throws IOException {
+  public void testPermissions() throws IOException, DuplicateNameException {
     // create a note and a paragraph
-    Note note = notebook.createNote(null);
+    Note note = notebook.createNote(null, EMPTY_STRING);
     NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();
     // empty owners, readers and writers means note is public
     assertEquals(notebookAuthorization.isOwner(note.getId(),
@@ -630,8 +665,8 @@ public void testPermissions() throws IOException {
 
   @Test
   public void testAbortParagraphStatusOnInterpreterRestart() throws InterruptedException,
-      IOException {
-    Note note = notebook.createNote(null);
+      IOException, DuplicateNameException {
+    Note note = notebook.createNote(null, EMPTY_STRING);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     ArrayList<Paragraph> paragraphs = new ArrayList<>();
@@ -666,9 +701,9 @@ public void testAbortParagraphStatusOnInterpreterRestart() throws InterruptedExc
   }
 
   @Test
-  public void testPerSessionInterpreterCloseOnNoteRemoval() throws IOException {
+  public void testPerSessionInterpreterCloseOnNoteRemoval() throws IOException, DuplicateNameException {
     // create a notes
-    Note note1  = notebook.createNote(null);
+    Note note1  = notebook.createNote(null, EMPTY_STRING);
     Paragraph p1 = note1.addParagraph();
     p1.setText("getId");
 
@@ -684,7 +719,7 @@ public void testPerSessionInterpreterCloseOnNoteRemoval() throws IOException {
 
     // remove note and recreate
     notebook.removeNote(note1.getId(), null);
-    note1 = notebook.createNote(null);
+    note1 = notebook.createNote(null, EMPTY_STRING);
     p1 = note1.addParagraph();
     p1.setText("getId");
 
@@ -696,12 +731,12 @@ public void testPerSessionInterpreterCloseOnNoteRemoval() throws IOException {
   }
 
   @Test
-  public void testPerSessionInterpreter() throws IOException {
+  public void testPerSessionInterpreter() throws IOException, DuplicateNameException {
     // create two notes
-    Note note1  = notebook.createNote(null);
+    Note note1  = notebook.createNote(null, EMPTY_STRING);
     Paragraph p1 = note1.addParagraph();
 
-    Note note2  = notebook.createNote(null);
+    Note note2  = notebook.createNote(null, "Second Note");
     Paragraph p2 = note2.addParagraph();
 
     p1.setText("getId");
@@ -737,9 +772,10 @@ public void testPerSessionInterpreter() throws IOException {
   }
 
   @Test
-  public void testPerSessionInterpreterCloseOnUnbindInterpreterSetting() throws IOException {
+  public void testPerSessionInterpreterCloseOnUnbindInterpreterSetting() throws IOException, 
+      DuplicateNameException {
     // create a notes
-    Note note1  = notebook.createNote(null);
+    Note note1  = notebook.createNote(null, EMPTY_STRING);
     Paragraph p1 = note1.addParagraph();
     p1.setText("getId");
 
@@ -768,7 +804,7 @@ public void testPerSessionInterpreterCloseOnUnbindInterpreterSetting() throws IO
   }
 
   @Test
-  public void testNotebookEventListener() throws IOException {
+  public void testNotebookEventListener() throws IOException, DuplicateNameException {
     final AtomicInteger onNoteRemove = new AtomicInteger(0);
     final AtomicInteger onNoteCreate = new AtomicInteger(0);
     final AtomicInteger onParagraphRemove = new AtomicInteger(0);
@@ -806,7 +842,7 @@ public void onParagraphStatusChange(Paragraph p, Status status) {
       }
     });
 
-    Note note1 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, EMPTY_STRING);
     assertEquals(1, onNoteCreate.get());
 
     Paragraph p1 = note1.addParagraph();
@@ -828,9 +864,9 @@ public void onParagraphStatusChange(Paragraph p, Status status) {
   }
 
   @Test
-  public void testNormalizeNoteName() throws IOException {
+  public void testNormalizeNoteName() throws IOException, DuplicateNameException {
     // create a notes
-    Note note1  = notebook.createNote(null);
+    Note note1  = notebook.createNote(null, EMPTY_STRING);
 
     note1.setName("MyNote");
     assertEquals(note1.getName(), "MyNote");
@@ -855,8 +891,8 @@ public void testNormalizeNoteName() throws IOException {
 
   @Test
   public void testGetAllNotes() throws Exception {
-    Note note1 = notebook.createNote(null);
-    Note note2 = notebook.createNote(null);
+    Note note1 = notebook.createNote(null, EMPTY_STRING);
+    Note note2 = notebook.createNote(null, EMPTY_STRING);
     assertEquals(2, notebook.getAllNotes(new AuthenticationInfo("anonymous")).size());
 
     notebook.getNotebookAuthorization().setOwners(note1.getId(), Sets.newHashSet("user1"));
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
index c768df80435..6b97a9ce5cc 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java
@@ -30,6 +30,7 @@
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
 import org.apache.zeppelin.dep.DependencyResolver;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterFactory;
 import org.apache.zeppelin.interpreter.InterpreterOption;
 import org.apache.zeppelin.interpreter.InterpreterOutput;
@@ -65,6 +66,7 @@ public class NotebookRepoSyncTest implements JobListenerFactory {
   private SearchService search;
   private NotebookAuthorization notebookAuthorization;
   private Credentials credentials;
+  private final String NOTE_NAME = "Note";
   private static final Logger LOG = LoggerFactory.getLogger(NotebookRepoSyncTest.class);
   
   @Before
@@ -116,14 +118,14 @@ public void testRepoCount() throws IOException {
   }
   
   @Test
-  public void testSyncOnCreate() throws IOException {
+  public void testSyncOnCreate() throws IOException, DuplicateNameException {
     /* check that both storage systems are empty */
     assertTrue(notebookRepoSync.getRepoCount() > 1);
     assertEquals(0, notebookRepoSync.list(0, null).size());
     assertEquals(0, notebookRepoSync.list(1, null).size());
     
     /* create note */
-    Note note = notebookSync.createNote(null);
+    Note note = notebookSync.createNote(null, NOTE_NAME);
 
     // check that automatically saved on both storages
     assertEquals(1, notebookRepoSync.list(0, null).size());
@@ -133,13 +135,13 @@ public void testSyncOnCreate() throws IOException {
   }
 
   @Test
-  public void testSyncOnDelete() throws IOException {
+  public void testSyncOnDelete() throws IOException, DuplicateNameException {
     /* create note */
     assertTrue(notebookRepoSync.getRepoCount() > 1);
     assertEquals(0, notebookRepoSync.list(0, null).size());
     assertEquals(0, notebookRepoSync.list(1, null).size());
     
-    Note note = notebookSync.createNote(null);
+    Note note = notebookSync.createNote(null, NOTE_NAME);
 
     /* check that created in both storage systems */
     assertEquals(1, notebookRepoSync.list(0, null).size());
@@ -156,10 +158,10 @@ public void testSyncOnDelete() throws IOException {
   }
   
   @Test
-  public void testSyncUpdateMain() throws IOException {
+  public void testSyncUpdateMain() throws IOException, DuplicateNameException {
     
     /* create note */
-    Note note = notebookSync.createNote(null);
+    Note note = notebookSync.createNote(null, NOTE_NAME);
     Paragraph p1 = note.addParagraph();
     Map config = p1.getConfig();
     config.put("enabled", true);
@@ -270,7 +272,8 @@ public void testOneWaySyncOnReloadedList() throws IOException, SchedulerExceptio
   }
 
   @Test
-  public void testCheckpointOneStorage() throws IOException, SchedulerException {
+  public void testCheckpointOneStorage() throws IOException, SchedulerException, 
+      DuplicateNameException {
     System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE.getVarName(), "org.apache.zeppelin.notebook.repo.GitNotebookRepo");
     ZeppelinConfiguration vConf = ZeppelinConfiguration.create();
 
@@ -287,7 +290,7 @@ public void testCheckpointOneStorage() throws IOException, SchedulerException {
     // no notes
     assertThat(vRepoSync.list(null).size()).isEqualTo(0);
     // create note
-    Note note = vNotebookSync.createNote(null);
+    Note note = vNotebookSync.createNote(null, NOTE_NAME);
     assertThat(vRepoSync.list(null).size()).isEqualTo(1);
     
     String noteId = vRepoSync.list(null).get(0).getId();
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
index 7eaca8c74eb..f9b45089f2c 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
@@ -28,6 +28,7 @@
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
 import org.apache.zeppelin.dep.DependencyResolver;
+import org.apache.zeppelin.exception.DuplicateNameException;
 import org.apache.zeppelin.interpreter.InterpreterFactory;
 import org.apache.zeppelin.interpreter.InterpreterOption;
 import org.apache.zeppelin.interpreter.mock.MockInterpreter1;
@@ -50,6 +51,7 @@ public class VFSNotebookRepoTest implements JobListenerFactory {
   private NotebookRepo notebookRepo;
   private InterpreterFactory factory;
   private DependencyResolver depResolver;
+  private final String NOTE_NAME = "Note";
 
   private File mainZepDir;
   private File mainNotebookDir;
@@ -105,8 +107,8 @@ public void testInvalidJsonFile() throws IOException {
   }
 
   @Test
-  public void testSaveNotebook() throws IOException, InterruptedException {
-    Note note = notebook.createNote(null);
+  public void testSaveNotebook() throws IOException, InterruptedException, DuplicateNameException {
+    Note note = notebook.createNote(null, NOTE_NAME);
     factory.setInterpreters(note.getId(), factory.getDefaultInterpreterSettingList());
 
     Paragraph p1 = note.addParagraph();