diff --git a/Examples/test-suite/java_director_exception_feature.i b/Examples/test-suite/java_director_exception_feature.i
index b649b541d..fc1af7a96 100644
--- a/Examples/test-suite/java_director_exception_feature.i
+++ b/Examples/test-suite/java_director_exception_feature.i
@@ -2,6 +2,8 @@
 
 %include <std_except.i>
 
+%warnfilter(SWIGWARN_TYPEMAP_DIRECTORTHROWS_UNDEF) MyNS::Foo::directorthrows_warning;
+
 %{
 #if defined(_MSC_VER)
   #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
@@ -178,6 +180,7 @@ public:
   virtual std::string ping(int excp) throw(int,MyNS::Exception2) = 0;
   virtual std::string pong(int excp) /* throws MyNS::Exception1 MyNS::Exception2 MyNS::Unexpected) */ = 0;
   virtual std::string genericpong(int excp) /* unspecified throws - exception is always DirectorException in C++, translated back to whatever thrown in java */ = 0;
+  virtual std::string directorthrows_warning(int excp) throw(double) {}
 };
 
 // Make a bar from a foo, so a call to Java Bar
diff --git a/Examples/test-suite/java_director_exception_feature_nspace.i b/Examples/test-suite/java_director_exception_feature_nspace.i
index 8723ef738..1f3d97ad3 100644
--- a/Examples/test-suite/java_director_exception_feature_nspace.i
+++ b/Examples/test-suite/java_director_exception_feature_nspace.i
@@ -6,7 +6,7 @@
 
 // When using namespaces with no -package, must put JNI classes into a namespace
 %pragma(java) jniclasspackage=%{MyNS_JNI%}
-%warnfilter(826);
+%warnfilter(SWIGWARN_JAVA_NSPACE_WITHOUT_PACKAGE);
 
 %{
 #if defined(_MSC_VER)
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index a0b094e34..37c3c5afb 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4058,7 +4058,7 @@ public:
       Printf(w->code, "jenv->%s(Swig::jclass_%s, Swig::director_methids[%s], %s);\n", methop, imclass_name, methid, jupcall_args);
 
       // Generate code to handle any Java exception thrown by director delegation
-      directorExceptHandler(n, catches_list ? catches_list : throw_parm_list, w, c_classname, name);
+      directorExceptHandler(n, catches_list ? catches_list : throw_parm_list, w);
 
       if (!is_void) {
 	String *jresult_str = NewString("jresult");
@@ -4164,7 +4164,7 @@ public:
    * This is generated after the Java method upcall.
    * ------------------------------------------------------------ */
 
-  void directorExceptHandler(Node *n, ParmList *throw_parm_list, Wrapper *w, String *c_classname, String *name) {
+  void directorExceptHandler(Node *n, ParmList *throw_parm_list, Wrapper *w) {
 
     String *featdirexcp = Getattr(n, "feature:director:except");
     if (!featdirexcp) {
@@ -4189,19 +4189,17 @@ public:
 	String *directorthrowshandlers_code = NewString("");
 
 	for (Parm *p = throw_parm_list; p; p = nextSibling(p)) {
-	  String *tmapdirthrows = Getattr(p, "tmap:directorthrows");
-	  String *excptype = Getattr(p,"type");
+	  String *tm = Getattr(p, "tmap:directorthrows");
+	  String *t = Getattr(p,"type");
 
-	  if (!tmapdirthrows) {
-	    Swig_warning(WARN_TYPEMAP_DIRECTORTHROWS_UNDEF, input_file, line_number,
-			 "Feature director:except on %s::%s with $directorthrowshandlers requires directorthrows typemap for exception %s.\n",
-			 SwigType_namestr(c_classname),SwigType_namestr(name), excptype);
-	  } else {
+	  if (tm) {
+	    String *directorthrows = Copy(tm);
 	    // replace $packagepath
-	    tmapdirthrows = Copy(tmapdirthrows);
-	    substituteClassnameAndPackagePath(excptype, tmapdirthrows, true, p);
-	    Printv(directorthrowshandlers_code, tmapdirthrows, NIL);
-	    Delete(tmapdirthrows);
+	    substituteClassnameAndPackagePath(t, directorthrows, true, p);
+	    Printv(directorthrowshandlers_code, directorthrows, NIL);
+	    Delete(directorthrows);
+	  } else {
+	    Swig_warning(WARN_TYPEMAP_DIRECTORTHROWS_UNDEF, Getfile(n), Getline(n), "No directorthrows typemap defined for %s\n", SwigType_str(t, 0));
 	  }
 	}
 	Replaceall(featdirexcp, "$directorthrowshandlers", directorthrowshandlers_code);