diff --git a/debian/changelog b/debian/changelog
index 3583a145..5ab802e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 byobu (5.21) unreleased; urgency=low
 
+  [ Dustin Kirkland ]
   * usr/lib/byobu/users:
     - clear cache on 0 users
 
+  [ Daniel Hahler ]
+  * usr/lib/byobu/include/common:
+    - clear stderr in byobu test
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 24 Jun 2012 16:25:33 -0500
 
 byobu (5.20-0ubuntu1) quantal; urgency=low
diff --git a/usr/lib/byobu/include/common b/usr/lib/byobu/include/common
index 34af3a7e..949535c0 100755
--- a/usr/lib/byobu/include/common
+++ b/usr/lib/byobu/include/common
@@ -23,9 +23,9 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
 	. "${BYOBU_PREFIX}/lib/${PKG}/include/dirs"
 	
 	# Find command/type/which
-	if command -v; then
+	if command -v 2>/dev/null; then
 		BYOBU_TEST="command -v"
-	elif type; then
+	elif type 2>/dev/null; then
 		BYOBU_TEST="type"
 	else
 		BYOBU_TEST="which"