diff --git a/src/mod/endpoints/mod_verto/Makefile.am b/src/mod/endpoints/mod_verto/Makefile.am
index dd54a32ee4..2c8f4f2334 100644
--- a/src/mod/endpoints/mod_verto/Makefile.am
+++ b/src/mod/endpoints/mod_verto/Makefile.am
@@ -25,7 +25,7 @@ MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS
 endif
 
 mcast/mcast_wrap.cpp:
-	cd mcast && swig -module MCAST -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o mcast_wrap.cpp MCAST.i
+	cd mcast && swig -module MCAST -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o mcast_wrap.cpp MCAST.i && patch -s -p0 -i hack.diff
 
 mcast/perlxsi.c:
 	$(PERL) -MExtUtils::Embed -e xsinit -- -o mcast/perlxsi.c
diff --git a/src/mod/endpoints/mod_verto/mcast/hack.diff b/src/mod/endpoints/mod_verto/mcast/hack.diff
new file mode 100644
index 0000000000..578a60bd90
--- /dev/null
+++ b/src/mod/endpoints/mod_verto/mcast/hack.diff
@@ -0,0 +1,29 @@
+--- mcast_wrap.cpp.old	2015-06-16 12:27:19.024000000 -0500
++++ mcast_wrap.cpp	2015-06-16 12:34:51.540000000 -0500
+@@ -1965,7 +1965,7 @@ XS(_wrap_McastHandle_send) {
+       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "McastHandle_send" "', argument " "2"" of type '" "char const *""'");
+     }
+     arg2 = reinterpret_cast< char * >(buf2);
+-    assert(arg1);
++    if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "McastHandle_send" "', argument " "1"" is NULL"); 
+     result = (int)(arg1)->send((char const *)arg2);
+     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
+     
+@@ -2006,7 +2006,7 @@ XS(_wrap_McastHandle_recv) {
+       } 
+       arg2 = static_cast< int >(val2);
+     }
+-    assert(arg1);
++    if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "McastHandle_recv" "', argument " "1"" is NULL");
+     result = (char *)(arg1)->recv(arg2);
+     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+     
+@@ -2037,7 +2037,7 @@ XS(_wrap_McastHandle_filenum) {
+       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "McastHandle_filenum" "', argument " "1"" of type '" "McastHandle *""'"); 
+     }
+     arg1 = reinterpret_cast< McastHandle * >(argp1);
+-    assert(arg1);
++    if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "McastHandle_filenum" "', argument " "1"" is NULL");
+     result = (arg1)->filenum();
+     ST(argvi) = SWIG_NewPointerObj((new mcast_socket_t(static_cast< const mcast_socket_t& >(result))), SWIGTYPE_p_mcast_socket_t, SWIG_POINTER_OWN | 0); argvi++ ;
+     
diff --git a/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp b/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp
index 5473788de7..7a1eb92c89 100644
--- a/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp
+++ b/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp
@@ -1965,6 +1965,7 @@ XS(_wrap_McastHandle_send) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "McastHandle_send" "', argument " "2"" of type '" "char const *""'");
     }
     arg2 = reinterpret_cast< char * >(buf2);
+    if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "McastHandle_send" "', argument " "1"" is NULL"); 
     result = (int)(arg1)->send((char const *)arg2);
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
@@ -2005,6 +2006,7 @@ XS(_wrap_McastHandle_recv) {
       } 
       arg2 = static_cast< int >(val2);
     }
+    if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "McastHandle_recv" "', argument " "1"" is NULL");
     result = (char *)(arg1)->recv(arg2);
     ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
     
@@ -2035,6 +2037,7 @@ XS(_wrap_McastHandle_filenum) {
       SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "McastHandle_filenum" "', argument " "1"" of type '" "McastHandle *""'"); 
     }
     arg1 = reinterpret_cast< McastHandle * >(argp1);
+    if (!arg1) SWIG_exception_fail(SWIG_ValueError, "in method '" "McastHandle_filenum" "', argument " "1"" is NULL");
     result = (arg1)->filenum();
     ST(argvi) = SWIG_NewPointerObj((new mcast_socket_t(static_cast< const mcast_socket_t& >(result))), SWIGTYPE_p_mcast_socket_t, SWIG_POINTER_OWN | 0); argvi++ ;