--- parser3/src/classes/table.C	2012/06/17 11:04:02	1.290
+++ parser3/src/classes/table.C	2013/03/15 11:21:57	1.292
@@ -21,7 +21,7 @@
 #include "pa_vbool.h"
 #include "pa_array.h"
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.290 2012/06/17 11:04:02 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.292 2013/03/15 11:21:57 misha Exp $";
 
 // class
 
@@ -980,7 +980,7 @@ static bool _locate_name_value(Table& ta
 static void _locate(Request& r, MethodParams& params) {
 	Table& table=GET_SELF(r, VTable).table();
 
-	bool result=params[0].get_junction()?
+	bool result=params[0].get_junction() || (params.count() == 1) ?
 		_locate_expression(table, r, params) :
 		_locate_name_value(table, r, params);
 	r.write_no_lang(VBool::get(result));
@@ -1089,7 +1089,7 @@ public:
 	}
 	bool add_row_cell(SQL_Error& error, const char* str, size_t ) {
 		try {
-			*row+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
+			*row+=str?new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):&String::Empty;
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");