From 348eb293d00bf67e4635c6948d77eb84ea9a0f43 Mon Sep 17 00:00:00 2001
From: James Barnett <James_Barnett@rapid7.com>
Date: Wed, 18 Apr 2018 13:02:31 -0500
Subject: [PATCH] Handle case when renaming nonexistant workspace

---
 lib/msf/ui/console/command_dispatcher/db.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/msf/ui/console/command_dispatcher/db.rb b/lib/msf/ui/console/command_dispatcher/db.rb
index 0ac195a263..4139275434 100644
--- a/lib/msf/ui/console/command_dispatcher/db.rb
+++ b/lib/msf/ui/console/command_dispatcher/db.rb
@@ -170,8 +170,13 @@ class Db
         return
       end
 
+      ws_to_update = framework.db.find_workspace(names.first)
+      unless ws_to_update
+        print_error("Workspace '#{names.first}' does not exist")
+        return
+      end
       opts = {
-          id: framework.db.find_workspace(names.first).id,
+          id: ws_to_update.id,
           name: names.last
       }
       begin