diff --git a/weblinks.module b/weblinks.module
index 8d8c31e..6a8ff95 100644
--- a/weblinks.module
+++ b/weblinks.module
@@ -592,6 +592,15 @@ function weblinks_node_presave($node) {
       }
     }
   }
+  // If the node is being created via Devel Generate then provide a random
+  // three-letter .com url. This avoids messages during node save and allows the
+  // node to be editted later without further problems.
+  // @TODO If/when 'url' is converted into a proper D7 field this code can be
+  // moved into a separate weblinks.devel_generate.inc file.
+  // See https://www.drupal.org/node/2414531 for more details.  
+  if ($node->type == 'weblinks' && isset($node->devel_generate['node_types']['weblinks'])) {
+    $node->url = 'http://www.' . substr(str_shuffle("abcdefghijklmnopqrstuvwxyz"), 0, 3) . '.com';
+  }
 }
 
 /**