--- a/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Fri Mar 18 00:52:22 2011 +0100
+++ b/src/main/java/org/icedrobot/daneel/rewriter/DexRewriter.java	Fri Mar 18 01:07:56 2011 +0100
@@ -321,85 +321,85 @@
         @Override
         public void visitInstrArray(Opcode opcode, int vsrcOrDest, int varray,
                 int vindex) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrBinOp(Opcode opcode, int vdest, int vsrc,
                 int vsrc2) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrBinOpAndLiteral(Opcode opcode, int vdest,
                 int vsrc, int value) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrClass(Opcode opcode, int vdest, String type) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrConstU32(Opcode opcode, int vdest, int value) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI: " + opcode);
         }
 
         @Override
         public void visitInstrFillArrayData(Opcode opcode, int vsrc,
                 Object arrayData) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrFilledNewArray(Opcode opcode, int num, int va,
                 int vpacked, String type) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrGoto(Opcode opcode, Label label) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrIfTest(Opcode opcode, int vsrc1, int vsrc2,
                 Label label) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrIfTestZ(Opcode opcode, int vsrc, Label label) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrInstanceof(Opcode opcode, int vdest, int vsrc,
                 String type) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrNewArray(Opcode opcode, int vdest, int vsize,
                 String type) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrOp(Opcode opcode, int srcOrDst) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrSwitch(Opcode opcode, int vsrc,
                 Map<Integer, Label> labels) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override
         public void visitInstrUnaryOp(Opcode opcode, int vdest, int vsrc) {
-            throw new UnsupportedOperationException("NYI");
+            throw new UnsupportedOperationException("NYI" + opcode);
         }
 
         @Override