From d3f1823f8ac01258a88010f8eec522f8e6299588 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Date: Fri, 19 Aug 2011 18:12:41 +0400
Subject: [PATCH] Fix NPE in HgErrorHandler

---
 plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java
index e80373f66032..e58b488ec638 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java
@@ -13,11 +13,15 @@
 package org.zmlx.hg4idea;
 
 import com.intellij.openapi.vcs.VcsException;
+import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 
 public abstract class HgErrorHandler {
   
-  public static HgCommandResult ensureSuccess(HgCommandResult result) throws VcsException {
+  public static HgCommandResult ensureSuccess(@Nullable HgCommandResult result) throws VcsException {
+    if (result == null) {
+      throw new VcsException("Couldn't execute Mercurial command");
+    }
     if (fatalErrorOccurred(result)) {
       throw new VcsException(result.getRawError());
     }