diff --git a/components/lazsvnpkg/svnlogform.pas b/components/lazsvnpkg/svnlogform.pas
index b4da24f0eb..d8d3edb98d 100644
--- a/components/lazsvnpkg/svnlogform.pas
+++ b/components/lazsvnpkg/svnlogform.pas
@@ -396,11 +396,12 @@ begin
 
           //message
           if NodeName = 'msg' then
-            LogItem.Msg:=ReplaceLineEndings(tmpNode.FirstChild.NodeValue, LineEnding);
+            if Assigned(tmpNode.FirstChild) then
+              LogItem.Msg:=ReplaceLineEndings(tmpNode.FirstChild.NodeValue, LineEnding);
         end;
 
         ActionNode := tmpNode.FirstChild;
-        if Assigned(ActionNode.Attributes) then
+        if Assigned(ActionNode) and Assigned(ActionNode.Attributes) then
         repeat
 
           //attributes
diff --git a/components/lazsvnpkg/svnstatusform.pas b/components/lazsvnpkg/svnstatusform.pas
index f015bf1198..ad0cc40e7c 100644
--- a/components/lazsvnpkg/svnstatusform.pas
+++ b/components/lazsvnpkg/svnstatusform.pas
@@ -106,6 +106,11 @@ var
   StatusItem : PSVNStatusItem;
   FileName: string;
 begin
+  if SVNCommitMsgMemo.Text = '' then
+    if MessageDlg ('No message set.', 'Do you wish to continue?', mtConfirmation,
+                  [mbYes, mbNo],0) <> mrYes then
+      exit;
+
   //commit the checked files
   CmdLine := SVNExecutable + ' commit --force-log ';