diff --git a/src/backend/mi2/mi2.ts b/src/backend/mi2/mi2.ts
index d1feca6..d8d2879 100644
--- a/src/backend/mi2/mi2.ts
+++ b/src/backend/mi2/mi2.ts
@@ -544,7 +544,7 @@ export class MI2 extends EventEmitter implements IBackend {
 								this.breakpoints.set(newBrk, bkptNum);
 								resolve([true, newBrk]);
 							} else {
-								resolve([false, null]);
+								resolve([false, undefined]);
 							}
 						}, reject);
 					}
diff --git a/src/mibase.ts b/src/mibase.ts
index ec083bd..9c10fe7 100644
--- a/src/mibase.ts
+++ b/src/mibase.ts
@@ -294,7 +294,7 @@ export class MI2DebugSession extends DebugSession {
 		this.miDebugger.getStack(args.levels, args.threadId).then(stack => {
 			const ret: StackFrame[] = [];
 			stack.forEach(element => {
-				let source = null;
+				let source = undefined;
 				let file = element.file;
 				if (file) {
 					if (this.isSSH) {
diff --git a/tslint.json b/tslint.json
index c6d4136..24ffabe 100644
--- a/tslint.json
+++ b/tslint.json
@@ -2,6 +2,7 @@
 	"defaultSeverity": "error",
 	"rules": {
 		"no-var-keyword": true,
-		"prefer-const": true
+		"prefer-const": true,
+		"no-null-keyword": true
 	}
 }