diff --git a/components/synedit/syneditmarks.pp b/components/synedit/syneditmarks.pp
index 0967c08744..699d3ec21d 100644
--- a/components/synedit/syneditmarks.pp
+++ b/components/synedit/syneditmarks.pp
@@ -1052,6 +1052,7 @@ begin
     exit;
 
   LinePos := CurLine.LineNum;
+  LineBSize := 0;
   FInternalIterator.Invalidate; // TODO: better notification system
 
   if aLineBrkCnt > 0 then begin
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 232c28e4d5..a2bacd4e30 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -3831,6 +3831,10 @@ resourcestring
   lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound = 'The package %'
     +'s%s%s is marked for installation, but can not be found.%sRemove '
     +'dependency from the installation list of packages?';
+  lisERRORInvalidBuildMode = 'ERROR: invalid build mode "%s"';
+  lisAvailableProjectBuildModes = 'Available project build modes:';
+  lisThisProjectHasOnlyTheDefaultBuildMode = 'This project has only the '
+    +'default build mode.';
   lisPkgMangstaticPackagesConfigFile = 'static packages config file';
   lisPkgMangUnableToCreateTargetDirectoryForLazarus = 'Unable to create '
     +'target directory for lazarus:%s%s%s%s.%sThis directory is needed for '
diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr
index 3e44c67974..f54ac037d2 100644
--- a/ide/lazbuild.lpr
+++ b/ide/lazbuild.lpr
@@ -434,7 +434,7 @@ begin
         debugln(BuildLazProfiles[i].Name);
       end;
       debugln;
-      exit;
+      Halt(ErrorBuildFailed);
     end;
     CurProf:=BuildLazProfiles[i];
   end;
@@ -634,6 +634,7 @@ var
   TargetExeDir: String;
   NewBuildMode: TProjectBuildMode;
   CompilePolicy: TPackageUpdatePolicy;
+  i: Integer;
 begin
   Result:=false;
   CloseProject(Project1);
@@ -649,7 +650,26 @@ begin
   if (BuildModeOverride<>'') then begin
     NewBuildMode:=Project1.BuildModes.Find(BuildModeOverride);
     if NewBuildMode=nil then
-      Error(ErrorBuildFailed,'invalid build mode '+BuildModeOverride);
+    begin
+      debugln([Format(lisERRORInvalidBuildMode, [BuildModeOverride])]);
+      debugln;
+      if Project1.BuildModes.Count>1 then
+      begin
+        debugln(lisAvailableProjectBuildModes);
+        for i:=0 to Project1.BuildModes.Count-1 do
+        begin
+          if Project1.BuildModes[i]=Project1.ActiveBuildMode then
+            dbgout('* ')
+          else
+            dbgout('  ');
+          debugln(Project1.BuildModes[i].Name);
+        end;
+      end else begin
+        debugln(lisThisProjectHasOnlyTheDefaultBuildMode);
+      end;
+      debugln;
+      Halt(ErrorBuildFailed);
+    end;
     Project1.ActiveBuildMode:=NewBuildMode;
   end;
   // then override specific options