X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xs-src%2FMouseAccessor.xs;h=ca0bb90b23754e345f3cf9175394d03469b7f7cb;hb=caf77af6fd814a2b8de929227bd495b1472768c9;hp=37c5ffd8708dd9f7903f29e6afd449560fd58c73;hpb=28e3abdf23123bfb0bd056e9e21f386c9269559f;p=gitmo%2FMouse.git

diff --git a/xs-src/MouseAccessor.xs b/xs-src/MouseAccessor.xs
index 37c5ffd..ca0bb90 100644
--- a/xs-src/MouseAccessor.xs
+++ b/xs-src/MouseAccessor.xs
@@ -1,9 +1,9 @@
 #include "mouse.h"
 
-#define CHECK_INSTANCE(instance) STMT_START{                          \
-        if(!(SvROK(instance) && SvTYPE(SvRV(instance)) == SVt_PVHV)){ \
-            croak("Invalid object instance");                         \
-        }                                                             \
+#define CHECK_INSTANCE(instance) STMT_START{      \
+        if(!IsHashRef(instance)){                 \
+            croak("Invalid object instance");     \
+        }                                         \
     } STMT_END
 
 
@@ -88,10 +88,12 @@ mouse_push_values(pTHX_ SV* const value, U16 const flags){
             PUSHs(svp ? *svp : &PL_sv_undef);
         }
     }
-    else if(flags & MOUSEf_TC_IS_HASHREF){
+    else{
         HV* hv;
         HE* he;
 
+        assert(flags & MOUSEf_TC_IS_HASHREF);
+
         if(!IsHashRef(value)){
             croak("Mouse-panic: Not a HASH reference");
         }