diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index 5405b0920..ee5465911 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -39,7 +39,6 @@
 #include "client/Response.hxx"
 #include "util/Macros.hxx"
 #include "util/Tokenizer.hxx"
-#include "util/Error.hxx"
 #include "util/StringAPI.hxx"
 
 #ifdef ENABLE_SQLITE
@@ -418,8 +417,4 @@ try {
 	Response r(client, num);
 	PrintError(r, std::current_exception());
 	return CommandResult::ERROR;
-} catch (const Error &error) {
-	Response r(client, num);
-	print_error(r, error);
-	return CommandResult::ERROR;
 }
diff --git a/src/command/CommandError.cxx b/src/command/CommandError.cxx
index ea1fab039..dbf7a59ff 100644
--- a/src/command/CommandError.cxx
+++ b/src/command/CommandError.cxx
@@ -22,7 +22,6 @@
 #include "PlaylistError.hxx"
 #include "db/DatabaseError.hxx"
 #include "client/Response.hxx"
-#include "util/Error.hxx"
 #include "Log.hxx"
 
 #include <system_error>
@@ -82,30 +81,6 @@ ToAck(DatabaseErrorCode code)
 }
 #endif
 
-gcc_pure
-static enum ack
-ToAck(const Error &error)
-{
-	if (error.IsDomain(ack_domain)) {
-		return (enum ack)error.GetCode();
-	} else if (error.IsDomain(errno_domain)) {
-		return ACK_ERROR_SYSTEM;
-	}
-
-	return ACK_ERROR_UNKNOWN;
-}
-
-CommandResult
-print_error(Response &r, const Error &error)
-{
-	assert(error.IsDefined());
-
-	LogError(error);
-
-	r.Error(ToAck(error), error.GetMessage());
-	return CommandResult::ERROR;
-}
-
 gcc_pure
 static enum ack
 ToAck(std::exception_ptr ep)
@@ -125,8 +100,6 @@ ToAck(std::exception_ptr ep)
 #if defined(__GLIBCXX__) && __GLIBCXX__ < 20151204
 	} catch (const std::exception &e) {
 #else
-	} catch (const Error &error) {
-		return ToAck(error);
 	} catch (...) {
 #endif
 		try {
@@ -152,8 +125,6 @@ PrintError(Response &r, std::exception_ptr ep)
 	} catch (const std::exception &e) {
 		LogError(e);
 		r.Error(ToAck(ep), e.what());
-	} catch (const Error &error) {
-		print_error(r, error);
 	} catch (...) {
 		r.Error(ACK_ERROR_UNKNOWN, "Unknown error");
 	}
diff --git a/src/command/CommandError.hxx b/src/command/CommandError.hxx
index 7c326484d..7a7bc7fca 100644
--- a/src/command/CommandError.hxx
+++ b/src/command/CommandError.hxx
@@ -25,14 +25,10 @@
 #include <exception>
 
 class Response;
-class Error;
 
 /**
- * Send the #Error to the client.
+ * Send the exception to the client.
  */
-CommandResult
-print_error(Response &r, const Error &error);
-
 void
 PrintError(Response &r, std::exception_ptr ep);
 
diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index 995e3a22c..52b928255 100644
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -32,7 +32,6 @@
 #include "AudioFormat.hxx"
 #include "ReplayGainConfig.hxx"
 #include "util/ScopeExit.hxx"
-#include "util/Error.hxx"
 
 #ifdef ENABLE_DATABASE
 #include "db/update/Service.hxx"
@@ -196,8 +195,6 @@ handle_status(Client &client, gcc_unused Request args, Response &r)
 		client.player_control.LockCheckRethrowError();
 	} catch (const std::exception &e) {
 		r.Format(COMMAND_STATUS_ERROR ": %s\n", e.what());
-	} catch (const Error &error) {
-		r.Format(COMMAND_STATUS_ERROR ": %s\n", error.GetMessage());
 	} catch (...) {
 		r.Format(COMMAND_STATUS_ERROR ": unknown\n");
 	}