diff --git a/src/services/services.ts b/src/services/services.ts
index 6fe45a775ca..d0bc5c96ec8 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2528,7 +2528,7 @@ namespace ts {
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName,
                 useCaseSensitiveFileNames: () => useCaseSensitivefileNames,
-                getNewLine: () => host.getNewLine ? host.getNewLine() : carriageReturnLineFeed,
+                getNewLine: () => getNewLineOrDefaultFromHost(host),
                 getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
                 writeFile: (fileName, data, writeByteOrderMark) => { },
                 getCurrentDirectory: () => host.getCurrentDirectory()
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 42247c31ece..d808f94a906 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -529,7 +529,7 @@ namespace ts {
         }
 
         private realizeDiagnostics(diagnostics: Diagnostic[]): { message: string; start: number; length: number; category: string; }[]{
-            var newLine = getNewLineOrDefault(this.host.getNewLine);
+            var newLine = getNewLineOrDefaultFromHost(this.host);
             return ts.realizeDiagnostics(diagnostics, newLine);
         }
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index a1548fc3dd4..fb897851f05 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -629,7 +629,7 @@ namespace ts {
     /**
      * The default is CRLF.
      */
-    export function getNewLineOrDefaultFromHost(host: LanguageServiceHost) {
+    export function getNewLineOrDefaultFromHost(host: LanguageServiceHost | LanguageServiceShimHost) {
         return host.getNewLine ? host.getNewLine() : carriageReturnLineFeed;
     }