diff --git a/vhdlpp/architec_emit.cc b/vhdlpp/architec_emit.cc
index fb08367cc..34e71ca8a 100644
--- a/vhdlpp/architec_emit.cc
+++ b/vhdlpp/architec_emit.cc
@@ -161,7 +161,7 @@ int ProcessStatement::emit(ostream&out, Entity*ent, Architecture*arc)
 
       for (list<SequentialStmt*>::iterator cur = statements_list_.begin()
 		 ; cur != statements_list_.end() ; ++cur) {
-	    (*cur)->emit(out, ent, arc);
+	    errors += (*cur)->emit(out, ent, arc);
       }
 
       out << "end" << endl;
diff --git a/vhdlpp/entity_emit.cc b/vhdlpp/entity_emit.cc
index ef15ad5e2..6ffd54b69 100644
--- a/vhdlpp/entity_emit.cc
+++ b/vhdlpp/entity_emit.cc
@@ -62,11 +62,11 @@ int Entity::emit(ostream&out)
 			break;
 		      case PORT_IN:
 			out << "input ";
-			decl.emit(out, port->name);
+			errors += decl.emit(out, port->name);
 			break;
 		      case PORT_OUT:
 			out << "output ";
-			decl.emit(out, port->name);
+			errors += decl.emit(out, port->name);
 			break;
 		  }
 	    }
diff --git a/vhdlpp/sequential_emit.cc b/vhdlpp/sequential_emit.cc
index 6deee0de5..f9512819c 100644
--- a/vhdlpp/sequential_emit.cc
+++ b/vhdlpp/sequential_emit.cc
@@ -92,7 +92,7 @@ int SignalSeqAssignment::emit(ostream&out, Entity*ent, Architecture*arc)
       } else {
 	    Expression*tmp = waveform_.front();
 	    out << " <= ";
-	    tmp->emit(out, ent, arc);
+	    errors += tmp->emit(out, ent, arc);
 	    out << ";" << endl;
       }
 
@@ -106,7 +106,7 @@ int VariableSeqAssignment::emit(ostream&out, Entity*ent, Architecture*arc)
       errors += lval_->emit(out, ent, arc);
 
       out << " = ";
-      rval_->emit(out, ent, arc);
+      errors += rval_->emit(out, ent, arc);
       out << ";" << endl;
 
       return errors;