From 1c012a1a3f99aea8affb7cb63461178826d2f9fd Mon Sep 17 00:00:00 2001
From: MikhailArkhipov <mikhaila@microsoft.com>
Date: Wed, 12 Sep 2018 13:49:15 -0700
Subject: [PATCH] Fix null ref

---
 src/Analysis/Engine/Impl/ModuleResolver.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Analysis/Engine/Impl/ModuleResolver.cs b/src/Analysis/Engine/Impl/ModuleResolver.cs
index 920916e6f..01197a3a0 100644
--- a/src/Analysis/Engine/Impl/ModuleResolver.cs
+++ b/src/Analysis/Engine/Impl/ModuleResolver.cs
@@ -93,7 +93,7 @@ internal static IEnumerable<string> ResolvePotentialModuleNames(
             string relativeModuleName,
             bool absoluteImports
         ) {
-            string importingFrom = null;
+            string importingFrom = string.Empty;
             if (!string.IsNullOrEmpty(importingFromModuleName)) {
                 importingFrom = importingFromModuleName;
                 if (!string.IsNullOrEmpty(importingFromFilePath) && ModulePath.IsInitPyFile(importingFromFilePath)) {
@@ -149,7 +149,7 @@ bool absoluteImports
 
         private static string GetModuleFullName(string originatingModule, string relativePath) {
             // Check if it is indeed relative
-            if (string.IsNullOrEmpty(relativePath) || relativePath[0] != '.') {
+            if (string.IsNullOrEmpty(originatingModule) || string.IsNullOrEmpty(relativePath) || relativePath[0] != '.') {
                 return relativePath;
             }