diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java index c5692ba36fbc..13ddcea34141 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgShowConfigCommand.java @@ -40,6 +40,10 @@ public class HgShowConfigCommand { HgCommandResult result = HgCommandService.getInstance(project).execute(repo, "showconfig", null); + if (result == null) { + return Collections.emptyMap(); + } + Map options = new HashMap(); for (String line : result.getOutputLines()) { String[] option = StringUtils.splitPreserveAllTokens(line, '=');