Index: tlsBIO.c
==================================================================
--- tlsBIO.c
+++ tlsBIO.c
@@ -258,15 +258,15 @@
 			dprintf("Got BIO_SET_CLOSE");
 			BIO_set_shutdown(bio, num);
 			break;
 		case BIO_CTRL_EOF:
 			dprintf("Got BIO_CTRL_EOF");
-			ret = Tcl_Eof(chan);
+			ret = ((chan) ? Tcl_Eof(chan) : 1);
 			break;
 		case BIO_CTRL_PENDING:
 			dprintf("Got BIO_CTRL_PENDING");
-			ret = ((chan) ? Tcl_InputBuffered(chan) : 0);
+			ret = ((chan) ? ((Tcl_InputBuffered(chan) ? 1 : 0)) : 0);
 			dprintf("BIO_CTRL_PENDING(%d)", (int) ret);
 			break;
 		case BIO_CTRL_WPENDING:
 			dprintf("Got BIO_CTRL_WPENDING");
 			ret = 0;
@@ -274,11 +274,11 @@
 		case BIO_CTRL_DUP:
 			dprintf("Got BIO_CTRL_DUP");
 			break;
 		case BIO_CTRL_FLUSH:
 			dprintf("Got BIO_CTRL_FLUSH");
-			ret = ((Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
+			ret = ((chan) && (Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
 			dprintf("BIO_CTRL_FLUSH returning value %li", ret);
 			break;
 		default:
 			dprintf("Got unknown control command (%i)", cmd);
 			ret = -2;

Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -718,45 +718,44 @@
 	statePtr->watchMask = 0;
 
         return;
     }
 
-	statePtr->watchMask = mask;
-
-	/* No channel handlers any more. We will be notified automatically
-	 * about events on the channel below via a call to our
-	 * 'TransformNotifyProc'. But we have to pass the interest down now.
-	 * We are allowed to add additional 'interest' to the mask if we want
-	 * to. But this transformation has no such interest. It just passes
-	 * the request down, unchanged.
-	 */
-
-
-        dprintf("Registering our interest in the lower channel (chan=%p)", (void *) downChan);
-	(Tcl_GetChannelType(downChan))
-	    ->watchProc(Tcl_GetChannelInstanceData(downChan), mask);
-
-	/*
-	 * Management of the internal timer.
-	 */
-
-	if (statePtr->timer != (Tcl_TimerToken) NULL) {
-            dprintf("A timer was found, deleting it");
-	    Tcl_DeleteTimerHandler(statePtr->timer);
-	    statePtr->timer = (Tcl_TimerToken) NULL;
-	}
-
-	if (mask & TCL_READABLE) {
-		if (Tcl_InputBuffered(statePtr->self) > 0 || BIO_ctrl_pending(statePtr->bio) > 0) {
-			/*
-			 * There is interest in readable events and we actually have
-			 * data waiting, so generate a timer to flush that.
-			 */
-			dprintf("Creating a new timer since data appears to be waiting");
-			statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY, TlsChannelHandlerTimer, (ClientData) statePtr);
-		}
-	}
+    statePtr->watchMask = mask;
+
+    /* No channel handlers any more. We will be notified automatically
+     * about events on the channel below via a call to our
+     * 'TransformNotifyProc'. But we have to pass the interest down now.
+     * We are allowed to add additional 'interest' to the mask if we want
+     * to. But this transformation has no such interest. It just passes
+     * the request down, unchanged.
+     */
+
+
+	dprintf("Registering our interest in the lower channel (chan=%p)", (void *) downChan);
+    (Tcl_GetChannelType(downChan))
+	->watchProc(Tcl_GetChannelInstanceData(downChan), mask);
+
+    /*
+     * Management of the internal timer.
+     */
+
+    if (statePtr->timer != (Tcl_TimerToken) NULL) {
+	    dprintf("A timer was found, deleting it");
+	Tcl_DeleteTimerHandler(statePtr->timer);
+	statePtr->timer = (Tcl_TimerToken) NULL;
+    }
+
+    if ((mask & TCL_READABLE) &&
+	((Tcl_InputBuffered(statePtr->self) > 0) || (BIO_ctrl_pending(statePtr->bio) > 0))) {
+	/*
+	 * There is interest in readable events and we actually have
+	 * data waiting, so generate a timer to flush that.
+	 */
+	dprintf("Creating a new timer since data appears to be waiting");
+	statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY, TlsChannelHandlerTimer, (ClientData) statePtr);
+    }
 }
 
 /*
  *-------------------------------------------------------------------
  *