diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9e8eca0d895..f72c36be0c4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-03  Janis Johnson  <janisjo@codesourcery.com>
+
+	* testsuite/lib/gdb-test.exp (gdb_batch_check): Catch error running
+	gdb command.
+
 2013-01-08  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* doc/xml/manual/status_cxx2011.xml: Document that N3189 is missing.
diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp
index 3434ef2a7ac..7a00abcdbb3 100644
--- a/libstdc++-v3/testsuite/lib/gdb-test.exp
+++ b/libstdc++-v3/testsuite/lib/gdb-test.exp
@@ -219,7 +219,9 @@ proc gdb_batch_check {command pattern} {
     set gdb_name $::env(GUALITY_GDB_NAME)
     set cmd "$gdb_name -nw -nx -quiet -batch -ex \"$command\""
     send_log "Spawning: $cmd\n"
-    set res [remote_spawn target "$cmd"]
+    if [catch { set res [remote_spawn target "$cmd"] } ] {
+	return 0
+    }
     if { $res < 0 || $res == "" } {
 	return 0
     }