diff --git a/src/inputs/librespot-c/librespot-c.h b/src/inputs/librespot-c/librespot-c.h
index 39c69f91..ab4f224f 100644
--- a/src/inputs/librespot-c/librespot-c.h
+++ b/src/inputs/librespot-c/librespot-c.h
@@ -26,9 +26,9 @@ struct sp_credentials
   char username[64];
   char password[32];
 
-  uint8_t stored_cred[256]; // Actual size is 146, but leave room for some more
+  uint8_t stored_cred[512]; // Actual size is 146, but leave room for some more
   size_t stored_cred_len;
-  uint8_t token[256]; // Actual size is ?
+  uint8_t token[512]; // Actual size is 270 for family accounts
   size_t token_len;
 };
 
diff --git a/src/inputs/librespot-c/src/librespot-c.c b/src/inputs/librespot-c/src/librespot-c.c
index d77729f5..fb404d6e 100644
--- a/src/inputs/librespot-c/src/librespot-c.c
+++ b/src/inputs/librespot-c/src/librespot-c.c
@@ -142,7 +142,7 @@ session_new(struct sp_session **out, struct sp_cmdargs *cmdargs, event_callback_
   if (cmdargs->stored_cred)
     {
       if (cmdargs->stored_cred_len > sizeof(session->credentials.stored_cred))
-	RETURN_ERROR(SP_ERR_INVALID, "Invalid stored credential");
+	RETURN_ERROR(SP_ERR_INVALID, "Stored credentials too long");
 
       session->credentials.stored_cred_len = cmdargs->stored_cred_len;
       memcpy(session->credentials.stored_cred, cmdargs->stored_cred, session->credentials.stored_cred_len);
@@ -150,7 +150,7 @@ session_new(struct sp_session **out, struct sp_cmdargs *cmdargs, event_callback_
   else if (cmdargs->token)
     {
       if (strlen(cmdargs->token) > sizeof(session->credentials.token))
-	RETURN_ERROR(SP_ERR_INVALID, "Invalid token");
+	RETURN_ERROR(SP_ERR_INVALID, "Token too long");
 
       session->credentials.token_len = strlen(cmdargs->token);
       memcpy(session->credentials.token, cmdargs->token, session->credentials.token_len);