diff --git a/code/fd-stream.lisp b/code/fd-stream.lisp
index 6c5a8a06db1d6517c24693e6ff2cd861aca0a85a..62e48d76bf463fb6b4eb8dc08c73342fc2a3f5bf 100644
--- a/code/fd-stream.lisp
+++ b/code/fd-stream.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.116 2010/08/15 12:04:43 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fd-stream.lisp,v 1.117 2010/08/15 13:03:43 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1848,11 +1848,18 @@
 			  (d (cond ((characterp decoding-error)
 				    (constantly (char-code decoding-error)))
 				   ((eq t decoding-error)
+				    #+unicode
 				    #'(lambda (&rest args)
 					(apply 'cerror
 					       (intl:gettext "Use Unicode replacement character instead")
 					       args)
-					stream:+replacement-character-code+))
+					stream:+replacement-character-code+)
+				    #-unicode
+				    #'(lambda (&rest args)
+					(apply 'cerror
+					       (intl:gettext "Use question mark character instead")
+					       args)
+					#\?))
 				   (t
 				    decoding-error))))
 		      (%make-fd-stream :fd fd