// Copyright 2010 Victor Iacoban
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software distributed under
// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
// either express or implied. See the License for the specific language governing permissions and
// limitations under the License.
package org.zmlx.hg4idea;

import com.intellij.openapi.vcs.VcsException;
import org.zmlx.hg4idea.execution.HgCommandResult;

public abstract class HgErrorHandler {
  
  public static HgCommandResult ensureSuccess(HgCommandResult result) throws VcsException {
    if (fatalErrorOccurred(result)) {
      throw new VcsException(result.getRawError());
    }
    return result;
  }

  private static boolean fatalErrorOccurred(HgCommandResult result) {
    return 
      result.getExitValue() == 255 ||
      result.getRawError().contains("** unknown exception encountered");
  }
  
}
@@ -650,16 +650,59 @@
 eption;%0A
+import org.jetbrains.annotations.Nullable;%0A
 import o
@@ -833,16 +833,26 @@
 Success(
+@Nullable 
 HgComman
@@ -889,16 +889,116 @@
 ption %7B%0A
+    if (result == null) %7B%0A      throw new VcsException(%22Couldn't execute Mercurial command%22);%0A    %7D%0A
     if (

Fix NPE in HgErrorHandler