diff --git a/samples/sqlservices/README.md b/samples/sqlservices/README.md
index 949c27c3cd..f872792f22 100644
--- a/samples/sqlservices/README.md
+++ b/samples/sqlservices/README.md
@@ -5,3 +5,10 @@ This is a sample extension that will show some basic model-backed UI scenarios.
 - `yarn install` - to install the dependencies
 - `yarn build` - to build the code
 - `vsce package` - to produce an extension installation package
+
+## Launch ADS Dev instance with this extension
+- `yarn install` - to install dependencies
+- `yarn build` - to build the code
+- Launch VSCode and open the azuredatastudio's code folder, run the 'Launch azuredatastudio' debug option (to work around the issue. The next step won't work without doing this first)
+- Launch VSCode and open this folder, run the 'Debug in enlistment'
+- Once ADS launches, you should be able to run the sqlservices commands, for example: sqlservices.openDialog
\ No newline at end of file
diff --git a/samples/sqlservices/src/typings/refs.d.ts b/samples/sqlservices/src/typings/refs.d.ts
new file mode 100644
index 0000000000..6a4a450e69
--- /dev/null
+++ b/samples/sqlservices/src/typings/refs.d.ts
@@ -0,0 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
diff --git a/src/sql/workbench/browser/modelComponents/tree.component.ts b/src/sql/workbench/browser/modelComponents/tree.component.ts
index 4299ae7baa..b81d58a559 100644
--- a/src/sql/workbench/browser/modelComponents/tree.component.ts
+++ b/src/sql/workbench/browser/modelComponents/tree.component.ts
@@ -157,7 +157,9 @@ export default class TreeComponent extends ComponentBase<azdata.TreeProperties>
 
 	public setProperties(properties: { [key: string]: any; }): void {
 		super.setProperties(properties);
-		this._treeRenderer.options.withCheckbox = this.withCheckbox;
+		if (this._treeRenderer) {
+			this._treeRenderer.options.withCheckbox = this.withCheckbox;
+		}
 	}
 
 	public get withCheckbox(): boolean {