diff --git a/servers/slapd/back-sock/result.c b/servers/slapd/back-sock/result.c
index 439cea14a4..dd56c181e2 100644
--- a/servers/slapd/back-sock/result.c
+++ b/servers/slapd/back-sock/result.c
@@ -81,7 +81,11 @@ sock_read_and_send_results(
 		if ( strncasecmp( line, "CONTINUE", 8 ) == 0 ) {
 			struct sockinfo	*si = (struct sockinfo *) op->o_bd->be_private;
 			/* Only valid when operating as an overlay! */
-			assert( si->si_ops != 0 );
+			if ( !si->si_ops ) {
+				rs->sr_err = LDAP_OTHER;
+				rs->sr_text = "CONTINUE is only valid when operating as an overlay";
+				goto fail;
+			}
 			rs->sr_err = SLAP_CB_CONTINUE;
 			goto skip;
 		}