***************
*** 101,107 ****
    vs_base[0]=
      (restype==f_object ?  res :
       restype==f_fixnum ? make_fixnum((int)res)
-      :(object) FEerror("Bad result type"));
    vs_top=vs_base+1;
    CHECK_AVMA;
    return;}
--- 101,107 ----
    vs_base[0]=
      (restype==f_object ?  res :
       restype==f_fixnum ? make_fixnum((int)res)
+      :(object) FEerror("Bad result type",0));
    vs_top=vs_base+1;
    CHECK_AVMA;
    return;}
***************
*** 1399,1405 ****
      case 1: *(base++)=va_arg(ap,object);
      case 0: break;
      default:
-       FEerror(0,"bad args");
      } vs_top=base;
        base=base -i;
    	do{object fun=fcall.fun;
--- 1399,1405 ----
      case 1: *(base++)=va_arg(ap,object);
      case 0: break;
      default:
+       FEerror("bad args",0);
      } vs_top=base;
        base=base -i;
    	do{object fun=fcall.fun;
***************
*** 1493,1499 ****
        case 1: *(base++)=va_arg(ap,object);
        case 0: break;
        default:
- 	FEerror(0,"bad args");
        }  vs_top=base;
        base=base -i;
        (*fcall.fun->cf.cf_self)();
--- 1493,1499 ----
        case 1: *(base++)=va_arg(ap,object);
        case 0: break;
        default:
+ 	FEerror("bad args",0);
        }  vs_top=base;
        base=base -i;
        (*fcall.fun->cf.cf_self)();