2 files changed, 3 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index e05c420f..de2d0894 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
 serd (0.18.1) unstable;
 
+  * Fix crash when resolving against non-standard base URIs
   * Fix bug that caused "a" abbreviation in non-predicate position
   * Disable timestamps in HTML documentation for reproducible build
   * Fix clashing symbol "error" in amalgamation build
 
- -- David Robillard <d@drobilla.net>  Wed, 14 Nov 2012 10:48:57 -0500
+ -- David Robillard <d@drobilla.net>  Thu, 20 Dec 2012 16:27:10 -0500
 
 serd (0.18.0) stable;
 
diff --git a/src/uri.c b/src/uri.c
index 1812bb93..3294f96e 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -325,10 +325,7 @@ merge(SerdChunk* base, SerdChunk* path)
 	const uint8_t* begin = remove_dot_segments(path->buf, path->len, &up);
 	const uint8_t* end   = path->buf + path->len;
 
-	if (base->buf) {
-		assert(base->len > 0);
-		assert(base->buf[0] == '/');
-
+	if (base->buf && base->len > 0) {
 		// Find the up'th last slash
 		const uint8_t* base_last = (base->buf + base->len - 1);
 		++up;