diff --git a/src/jrd/met.epp b/src/jrd/met.epp
index 464996898f..7341b651b2 100644
--- a/src/jrd/met.epp
+++ b/src/jrd/met.epp
@@ -37,7 +37,7 @@
  * 2004.01.16 Vlad Horsun: added support for default parameters 
  */
 /*
-$Id: met.epp,v 1.91 2004-02-20 06:43:00 robocop Exp $
+$Id: met.epp,v 1.92 2004-02-21 09:23:03 skidder Exp $
 */
 // This MUST be at the top of the file
 #ifdef DARWIN
@@ -2779,7 +2779,7 @@ jrd_prc* MET_procedure(TDBB tdbb, int id, bool noscan, USHORT flags)
 			// Now, check the result of this function here! Null pointer means failure.
 			// Or should parse_procedure_blr and its callee throw exceptions instead?
 			if (!parse_procedure_blr(tdbb, procedure, &P.RDB$PROCEDURE_BLR, csb_))
-				throw std::exception("Error while parsing procedure's BLR.");
+				ERR_post(isc_random, isc_arg_string, "Error while parsing procedure's BLR.", 0);
 			procedure->prc_request->req_procedure = procedure;
 			for (i = 0; i < csb_->csb_rpt.getCount(); i++)
 			{
diff --git a/src/qli/exe.cpp b/src/qli/exe.cpp
index d305e8e8fc..745d40ca36 100644
--- a/src/qli/exe.cpp
+++ b/src/qli/exe.cpp
@@ -309,16 +309,16 @@ file* EXEC_open_output(qli_nod* node)
 #else
 	TEXT* argv[20];
 	TEXT** arg = argv;
-	p = filename;
-	while (*p) {
-		*arg++ = p;
-		while (*p && *p != ' ')
-			p++;
-		if (!*p)
+	TEXT* pp = filename;
+	while (*pp) {
+		*arg++ = pp;
+		while (*pp && *pp != ' ')
+			pp++;
+		if (!*pp)
 			break;
-		*p++ = 0;
-		while (*p == ' ')
-			p++;
+		*pp++ = 0;
+		while (*pp == ' ')
+			pp++;
 	}
 	*arg = NULL;
 
diff --git a/src/qli/expand.cpp b/src/qli/expand.cpp
index 56d5e8d6b1..f424bb051c 100644
--- a/src/qli/expand.cpp
+++ b/src/qli/expand.cpp
@@ -2939,7 +2939,8 @@ static void resolve_really( qli_fld* variable, const syn* field_node)
 	if (field_node->syn_count == 1)
 		resolved = MET_declare(0, variable, fld_name);
 	else if (field_node->syn_count == 2) {
-		for (qli_symbol* symbol = rel_name->nam_symbol; symbol;
+		qli_symbol *symbol;
+		for (symbol = rel_name->nam_symbol; symbol;
 			 symbol = symbol->sym_homonym)
 		{
 			if (symbol->sym_type == SYM_database) {