diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
index 761aec5f..d4b8212d 100644
--- a/src/mpdpp.cpp
+++ b/src/mpdpp.cpp
@@ -376,11 +376,16 @@ Song MPDConnection::GetCurrentSong() const
 		mpd_sendCurrentSongCommand(itsConnection);
 		mpd_InfoEntity *item = NULL;
 		item = mpd_getNextInfoEntity(itsConnection);
-		Song result = item->info.song;
-		item->info.song = 0;
-		mpd_freeInfoEntity(item);
-		mpd_finishCommand(itsConnection);
-		return result;
+		if (item)
+		{
+			Song result = item->info.song;
+			item->info.song = 0;
+			mpd_freeInfoEntity(item);
+			mpd_finishCommand(itsConnection);
+			return result;
+		}
+		else
+			return Song();
 	}
 	else
 		return Song();
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index fe6132ff..934ebb8d 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -103,7 +103,6 @@ time_t timer;
 
 int now_playing = -1;
 int browsed_dir_scroll_begin = 0;
-int stats_scroll_begin = 0;
 
 int lock_statusbar_delay = -1;