diff --git a/source/tristanable/manager.d b/source/tristanable/manager.d
index a9f8adf..43c57ad 100644
--- a/source/tristanable/manager.d
+++ b/source/tristanable/manager.d
@@ -137,7 +137,9 @@ public final class Manager
 		}
 		else
 		{
-			/* TODO: Throw an error here */
+			/* Unlock queue before throwing an exception */
+			queuesLock.unlock();
+			throw new TristanableException(this, "Cannot remove a queue with an id not in use");
 		}
 
 		queuesLock.unlock();