2 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b7dc0ef..3d9e9d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc2:
+*06/06/29:
+   * Fix fbsetroot segfault when DISPLAY is unset (Mark)
+     util/fbsetroot.cc
 *06/06/28:
    * Linear cycling wasn't affecting normal cycling order (Mark)
      WorkspaceCmd.cc
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 842e183..24d8c50 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -419,8 +419,12 @@ int main(int argc, char **argv) {
             display_name = argv[i];
         }
     }
- 
-    fbsetroot app(argc, argv, display_name);
- 
+
+    try {
+        fbsetroot app(argc, argv, display_name);
+    } catch (std::string error_str) {
+        cerr<<_FB_CONSOLETEXT(Common, Error, "Error", "Error message header")<<": "<<error_str<<endl;
+    }
+
     return (0);
 }