diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6eb24d8f9f6..a618d2a7499 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/std/array (array<>::at(size_type) const): Fix version
+	for undefined __EXCEPTIONS.
+
 2013-03-21  Andreas Tobler  <andreast@fgznet.ch>
 
 	* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc:
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array
index ae7445d0b21..3e177444083 100644
--- a/libstdc++-v3/include/std/array
+++ b/libstdc++-v3/include/std/array
@@ -174,8 +174,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       const_reference
       at(size_type __n) const
       {
-	return __n < _Nm ?
-	       _M_instance[__n] : __throw_out_of_range(__N("array::at"));
+	if (__n >= _Nm)
+	  std::__throw_out_of_range(__N("array::at"));
+	return _M_instance[__n];
       }
 #endif