--- parser3/src/classes/table.C	2016/09/08 16:31:35	1.322
+++ parser3/src/classes/table.C	2016/09/08 19:34:18	1.325
@@ -22,7 +22,7 @@
 #define USE_STRINGSTREAM
 #endif
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.322 2016/09/08 16:31:35 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.325 2016/09/08 19:34:18 moko Exp $";
 
 // class
 
@@ -111,7 +111,7 @@ struct TableControlChars {
 		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
 			sseparator=&vseparator->as_string();
 			if(sseparator->length()!=1)
-				throw Exception(PARSER_RUNTIME, sseparator, "separator must be one character long");
+				throw Exception(PARSER_RUNTIME, sseparator, "separator must be one byte character");
 			separator=sseparator->first_char();
 			separators[0]=separator;
 			result++;
@@ -121,9 +121,9 @@ struct TableControlChars {
 			if(sencloser->is_empty()){
 				encloser=0;
 			} else {
-			if(sencloser->length()!=1)
-				throw Exception(PARSER_RUNTIME, sencloser, "encloser must be one character long");
-			encloser=sencloser->first_char();
+				if(sencloser->length()!=1)
+					throw Exception(PARSER_RUNTIME, sencloser, "encloser must be empty or one byte character");
+				encloser=sencloser->first_char();
 			}
 			result++;
 		}
@@ -271,9 +271,8 @@ static void _create(Request& r, MethodPa
 
 	size_t options_param_index=data_param_index+1;
 	if( options_param_index<params.count() && (options=params.as_hash(options_param_index)) ) {
-		// cloning, so that we could change
-		options=new HashStringValue(*options);
-		control_chars.load(*options);
+		if(control_chars.load(*options)!=options->count())
+			throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 	}
 
 	// data