diff --git a/draft.page.inc b/draft.page.inc
index 8d65a7f..c9724fe 100644
--- a/draft.page.inc
+++ b/draft.page.inc
@@ -36,7 +36,11 @@ function draft_list() {
   while ($row = db_fetch_object($result)) {
     $data = unserialize($row->data);
     if (isset($data['node_id_from_server']) && is_numeric($data['node_id_from_server'])) {
-      $output = l(t('View'), 'node/'. $data['node_id_from_server'] .'/edit', array('query' => array('draft_id' => $row->draft_id)));
+      $qresult = db_query("SELECT nid FROM {node} WHERE nid = %d", $data['node_id_from_server']);
+      if(db_fetch_object($qresult))
+        $output = l(t('View'), 'node/'. $data['node_id_from_server'] .'/edit', array('query' => array('draft_id' => $row->draft_id)));
+      else
+        $output = l(t('View'), 'node/add/'. str_replace("_", "-", $row->node_type), array('query' => array('draft_id' => $row->draft_id)));
     }
     else {
       $output = l(t('View'), 'node/add/'. str_replace("_", "-", $row->node_type), array('query' => array('draft_id' => $row->draft_id)));
diff --git a/draft_views/includes/draft_views_views_handler_field_draft_view.inc b/draft_views/includes/draft_views_views_handler_field_draft_view.inc
index 0bb2c1b..ffa0a08 100644
--- a/draft_views/includes/draft_views_views_handler_field_draft_view.inc
+++ b/draft_views/includes/draft_views_views_handler_field_draft_view.inc
@@ -17,7 +17,11 @@ class draft_views_views_handler_field_draft_view extends views_handler_field {
   function render($values) {
     $data = unserialize(db_result(db_query("SELECT data FROM {drafts} WHERE draft_id = %d", $values->drafts_draft_id)));
     if (isset($data['node_id_from_server']) && is_numeric($data['node_id_from_server'])) {
-      $output = l(t('View'), 'node/'. $data['node_id_from_server'] .'/edit', array('query' => array('draft_id' => $values->drafts_draft_id)));
+      $qresult = db_query("SELECT nid FROM {node} WHERE nid = %d", $data['node_id_from_server']);
+      if(db_fetch_object($qresult))
+        $output = l(t('View'), 'node/'. $data['node_id_from_server'] .'/edit', array('query' => array('draft_id' => $values->drafts_draft_id)));
+      else
+        $output = l(t('View'), 'node/add/'. str_replace("_", "-", $values->drafts_node_type), array('query' => array('draft_id' => $values->drafts_draft_id)));
     }
     else {
       $output = l(t('View'), 'node/add/'. str_replace("_", "-", $values->drafts_node_type), array('query' => array('draft_id' => $values->drafts_draft_id)));
