diff --git a/src/helpers.cpp b/src/helpers.cpp
index c1479efc..48c76a02 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -176,6 +176,12 @@ void ParseArgv(int argc, char **argv)
 		}
 		else if (!strcmp(argv[i], "toggle"))
 		{
+			Mpd.UpdateStatus();
+			if (!Mpd.GetErrorMessage().empty())
+			{
+				std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
+				exit(1);
+			}
 			Mpd.Toggle();
 			quit = 1;
 		}
diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
index daa062e3..2e0ede25 100644
--- a/src/mpdpp.cpp
+++ b/src/mpdpp.cpp
@@ -424,7 +424,7 @@ void Connection::Toggle()
 		if (isPlaying())
 			mpd_send_toggle_pause(itsConnection);
 		else
-			mpd_send_toggle_pause(itsConnection);
+			mpd_send_play(itsConnection);
 	}
 }