diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 1ddbdc4f8..b1896ad9c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -249,8 +249,8 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             }
             fprintf(stderr,"fillbuy validated\n");
             break;
-        case 'e': // selloffer
-            break; // disable swaps
+        //case 'e': // selloffer
+        //    break; // disable swaps
         case 's': // selloffer
             //vin.0: normal input
             //vin.1+: valid CC output for sale
@@ -322,6 +322,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             fprintf(stderr,"fill validated\n");
             break;
         case 'E': // fillexchange
+            return(false);
             break; // disable asset swaps
             //vin.0: normal input
             //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
@@ -371,6 +372,10 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             }
             fprintf(stderr,"fill validated\n");
             break;
+        default:
+            fprintf(stderr,"illegal assets funcid.(%c)\n",funcid);
+            return(false);
+            break;
     }
     return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
 }
diff --git a/src/cc/channels.cpp b/src/cc/channels.cpp
index ec5f7aa9c..7218177d7 100644
--- a/src/cc/channels.cpp
+++ b/src/cc/channels.cpp
@@ -348,6 +348,10 @@ bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &
                                 return eval->Invalid("invalid amount, refund amount and funds in channel must match!");
                         }
                         break;
+                    default:
+                        fprintf(stderr,"illegal channels funcid.(%c)\n",funcid);
+                        return(false);
+                        break;
                 }
             }
             retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp
index 7d297c87a..8c5640cfd 100644
--- a/src/cc/dice.cpp
+++ b/src/cc/dice.cpp
@@ -685,6 +685,13 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
                     else if ( DiceVerifyTimeout(vinTx,timeoutblocks) == 0 )
                         return eval->Invalid("invalid timeout claim for timeout");
                     break;
+                case 'R':
+                    fprintf(stderr,"add validation for refunds\n");
+                    break;
+                default:
+                    fprintf(stderr,"illegal dice funcid.(%c)\n",funcid);
+                    return(false);
+                    break;
             }
         }
         return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
diff --git a/src/cc/oracles.cpp b/src/cc/oracles.cpp
index 524eba9c2..6ee5b2400 100644
--- a/src/cc/oracles.cpp
+++ b/src/cc/oracles.cpp
@@ -651,6 +651,10 @@ bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
                     }
                     return eval->Invalid("unexpected OraclesValidate 'D' tx invalid");
                     break;
+                default:
+                    fprintf(stderr,"illegal oracles funcid.(%c)\n",funcid);
+                    return(false);
+                    break;
             }
         }
         return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index e7a3750f3..1f3408252 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -287,6 +287,10 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
                         return eval->Invalid("unlock tx vout.2 isnt 0");
                     preventCCvouts = 1;
                     break;
+                default:
+                    fprintf(stderr,"illegal rewards funcid.(%c)\n",funcid);
+                    return(false);
+                    break;
             }
         }
         return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));