2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ddbecc5e..91179718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,8 @@ dillo-2.2 [??, 2009]
  - Assert that SimpleVector size is positive.
    Patches: Johannes Hofmann
 +- Removed redundant system includes.
-   Added the "nop" keybinding (nop = NO_OPERATION; cancels a default hook).
+ - Added the "nop" keybinding (nop = NO_OPERATION; cancels a default hook).
+ - Fixed segfault when URL is NULL and dpis can't be found.
    Patches: place (AKA corvid)
 +- Check chdir() return code in Paths::init.
    Patch: Michal Nowak
diff --git a/src/capi.c b/src/capi.c
index 57cb4184..ca5210ec 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -583,7 +583,7 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
                a_UIcmd_set_msg(conn->bw,
                                "ERROR: can't start dpid daemon "
                                "(URL scheme = '%s')!",
-                               URL_SCHEME(conn->url));
+                               conn->url ? URL_SCHEME(conn->url) : "");
             /* finish conn */
             Capi_conn_unref(conn);
             dFree(Info);