diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d67e8d20b..d0a0c930d1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+Wed Apr  2 14:16:51 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* remote-sim.c (gdbsim_open): Check return code from sim_open.
+
+start-sanitize-gdbtk
+Tue Apr  1 15:04:21 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
+
+	* configure.in (gdbtcl): Create soft-link for gdbtcl/ directory instead
+	of gdbtk.tcl.
+
+end-sanitize-gdbtk	
 Mon Mar 31 14:55:53 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* gdbinit.in: New file.
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 64dbb5dcf9..465565867c 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -503,9 +503,9 @@ gdbsim_open (args, from_tty)
     error ("Insufficient memory available to allocate simulator arg list.");
   make_cleanup (freeargv, (char *) argv);
 
-  /* FIXME: sim_open may call `error' if it fails, but perhaps it should
-     just return an error indicator and let us call `error'.  */
-  gdbsim_desc = sim_open (argv);
+  gdbsim_desc = sim_open (SIM_OPEN_DEBUG, argv);
+  if (gdbsim_desc == 0)
+    error ("unable to create simulator instance");
 
   push_target (&gdbsim_ops);
   target_fetch_registers (-1);