diff --git a/PDelays.cc b/PDelays.cc
index e6619f4eb..48d742621 100644
--- a/PDelays.cc
+++ b/PDelays.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: PDelays.cc,v 1.3 2001/01/14 23:04:55 steve Exp $"
+#ident "$Id: PDelays.cc,v 1.4 2001/01/20 02:15:50 steve Exp $"
 #endif
 
 # include  "PDelays.h"
@@ -66,6 +66,13 @@ static unsigned long calculate_val(Design*des, const NetScope*scope,
 
       } else {
 	    verinum*dv = expr->eval_const(des, scope->name());
+	    if (dv == 0) {
+		  cerr << expr->get_line() << ": sorry: non-constant "
+		       << "delays not supported here: " << *expr << endl;
+		  des->errors += 1;
+		  return 0;
+	    }
+
 	    assert(dv);
 	    val = dv->as_ulong();
 	    val = des->scale_to_precision(val, scope);
@@ -115,6 +122,9 @@ void PDelays::eval_delays(Design*des, const string&path,
 
 /*
  * $Log: PDelays.cc,v $
+ * Revision 1.4  2001/01/20 02:15:50  steve
+ *  apologize for not supporting non-constant delays.
+ *
  * Revision 1.3  2001/01/14 23:04:55  steve
  *  Generalize the evaluation of floating point delays, and
  *  get it working with delay assignment statements.
diff --git a/driver/main.c b/driver/main.c
index 106ab4806..e17cab2c6 100644
--- a/driver/main.c
+++ b/driver/main.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: main.c,v 1.5 2000/11/30 02:50:54 steve Exp $"
+#ident "$Id: main.c,v 1.6 2001/01/20 02:15:51 steve Exp $"
 #endif
 
 const char HELP[] =
@@ -154,7 +154,7 @@ static int t_vvm(char*cmd, unsigned ncmd)
 	    }
       }
 
-      sprintf(tmp, "%s -O " RDYNAMIC " -fno-exceptions -o %s -I%s "
+      sprintf(tmp, "%s " RDYNAMIC " -fno-exceptions -o %s -I%s "
 	      "-L%s %s.cc -lvvm -lvpip %s", CXX, opath, IVL_INC, IVL_LIB,
 	      opath, DLLIB);
 
@@ -518,6 +518,9 @@ int main(int argc, char **argv)
 
 /*
  * $Log: main.c,v $
+ * Revision 1.6  2001/01/20 02:15:51  steve
+ *  apologize for not supporting non-constant delays.
+ *
  * Revision 1.5  2000/11/30 02:50:54  steve
  *  Add command file (-c) support from Nadim Shaikli.
  *