diff --git a/src/misc.c b/src/misc.c
index 9061cff4..bbacb8ea 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -33,7 +33,6 @@
 #include <stdint.h>
 #include <limits.h>
 #include <sys/param.h>
-#include <assert.h>
 
 #include <unistr.h>
 #include <uniconv.h>
diff --git a/src/spotify.c b/src/spotify.c
index 5c9f5060..ce3eba70 100644
--- a/src/spotify.c
+++ b/src/spotify.c
@@ -2044,7 +2044,7 @@ void
 spotify_oauth_callback(struct evbuffer *evbuf, struct evkeyvalq *param, const char *redirect_uri)
 {
   const char *code;
-  const char *err = "";
+  const char *err;
   int ret;
 
   code = evhttp_find_header(param, "code");
diff --git a/src/spotify_webapi.c b/src/spotify_webapi.c
index 525f0cfb..01e41f2a 100644
--- a/src/spotify_webapi.c
+++ b/src/spotify_webapi.c
@@ -294,6 +294,7 @@ spotifywebapi_token_get(const char *code, const char *redirect_uri, const char *
   struct keyval kv;
   int ret;
 
+  *err = "";
   memset(&kv, 0, sizeof(struct keyval));
   ret = ( (keyval_add(&kv, "grant_type", "authorization_code") == 0) &&
           (keyval_add(&kv, "code", code) == 0) &&