diff --git a/src/player/Control.cxx b/src/player/Control.cxx
index 830dd146d..290f61af8 100644
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@@ -185,12 +185,7 @@ void
 PlayerControl::LockClearError()
 {
 	Lock();
-
-	if (error_type != PlayerError::NONE) {
-	    error_type = PlayerError::NONE;
-	    error.Clear();
-	}
-
+	ClearError();
 	Unlock();
 }
 
diff --git a/src/player/Control.hxx b/src/player/Control.hxx
index 812f4d621..edfde09fe 100644
--- a/src/player/Control.hxx
+++ b/src/player/Control.hxx
@@ -326,6 +326,11 @@ public:
 private:
 	void PauseLocked();
 
+	void ClearError() {
+		error_type = PlayerError::NONE;
+		error.Clear();
+	}
+
 public:
 	void LockPause();