diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc
index e0eb4b7..9f3eb73 100644
--- a/compiler/cpp/src/main.cc
+++ b/compiler/cpp/src/main.cc
@@ -754,6 +754,20 @@
 }
 
 /**
+ * Check that all the elements of a throws block are actually exceptions.
+ */
+bool validate_throws(t_struct* throws) {
+  const vector<t_field*>& members = throws->get_members();
+  vector<t_field*>::const_iterator m_iter;
+  for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
+    if (!(*m_iter)->get_type()->is_xception()) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
  * Parses a program
  */
 void parse(t_program* program, t_program* parent_program) {
diff --git a/compiler/cpp/src/main.h b/compiler/cpp/src/main.h
index f8828af..3ab2744 100644
--- a/compiler/cpp/src/main.h
+++ b/compiler/cpp/src/main.h
@@ -50,6 +50,11 @@
 void validate_field_value(t_field* field, t_const_value* cv);
 
 /**
+ * Check members of a throws block
+ */
+bool validate_throws(t_struct* throws);
+
+/**
  * Converts a string filename into a thrift program name
  */
 std::string program_name(std::string filename);
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index 2b09972..0b87386 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -766,6 +766,10 @@
     {
       pdebug("Throws -> tok_throws ( FieldList )");
       $$ = $3;
+      if (!validate_throws($$)) {
+        yyerror("Throws clause may not contain non-exception types");
+        exit(1);
+      }
     }
 |
     {