diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp
index fbcc98b9c..cf6c7609e 100644
--- a/src/subsonic/subsonicbaserequest.cpp
+++ b/src/subsonic/subsonicbaserequest.cpp
@@ -74,7 +74,7 @@ QUrl SubsonicBaseRequest::CreateUrl(const QString &ressource_name, const QList<P
 
   QUrl url(server_url());
 
-  if (url.path().right(1) == '/') {
+  if (!url.path().isEmpty() && url.path().right(1) == "/") {
     url.setPath(url.path() + QString("rest/") + ressource_name);
   }
   else
diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp
index 139d93df2..8eb1d878e 100644
--- a/src/subsonic/subsonicservice.cpp
+++ b/src/subsonic/subsonicservice.cpp
@@ -140,7 +140,7 @@ void SubsonicService::SendPing(QUrl url, const QString &username, const QString
     url_query.addQueryItem(encoded_param.first, encoded_param.second);
   }
 
-  if (url.path().right(1) == '/') {
+  if (!url.path().isEmpty() && url.path().right(1) == "/") {
     url.setPath(url.path() + QString("rest/ping.view"));
   }
   else
diff --git a/src/subsonic/subsonicurlhandler.cpp b/src/subsonic/subsonicurlhandler.cpp
index 7e628dc7e..e8d0709af 100644
--- a/src/subsonic/subsonicurlhandler.cpp
+++ b/src/subsonic/subsonicurlhandler.cpp
@@ -46,7 +46,7 @@ UrlHandler::LoadResult SubsonicUrlHandler::StartLoading(const QUrl &url) {
 
   QUrl media_url(server_url());
 
-  if (media_url.path().right(1) == '/') {
+  if (!media_url.path().isEmpty() && media_url.path().right(1) == "/") {
     media_url.setPath(media_url.path() + QString("rest/stream"));
   }
   else