1 files changed, 6 insertions, 2 deletions
diff --git a/src/tinyurl.c b/src/tinyurl.c
index 9b572319..9ee64977 100644
--- a/src/tinyurl.c
+++ b/src/tinyurl.c
@@ -60,10 +60,14 @@ tinyurl_get(char *url)
     curl_easy_perform(handle);
     curl_easy_cleanup(handle);
 
-    output.buffer[output.size++] = '\0';
     g_string_free(full_url, TRUE);
 
-    return output.buffer;
+    if (output.buffer != NULL) {
+        output.buffer[output.size++] = '\0';
+        return output.buffer;
+    } else {
+        return NULL;
+    }
 }
 
 static size_t