diff --git a/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts b/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts
index d202b42a6d..2676ef17ed 100644
--- a/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts
+++ b/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts
@@ -96,24 +96,24 @@ export class ServerTreeDragAndDrop implements IDragAndDrop {
 		let targetConnectionProfileGroup: ConnectionProfileGroup = this.getTargetGroup(targetElement);
 
 		const source = data.getData()[0];
-		let oldParent: ConnectionProfileGroup = source.getParent();
-		const self = this;
-		if (this.isDropAllowed(targetConnectionProfileGroup, oldParent, source)) {
+		if (source && source.getParent) {
+			let oldParent: ConnectionProfileGroup = source.getParent();
+			const self = this;
+			if (this.isDropAllowed(targetConnectionProfileGroup, oldParent, source)) {
 
-			if (source instanceof ConnectionProfile) {
-				// Change group id of profile
-				this._connectionManagementService.changeGroupIdForConnection(source, targetConnectionProfileGroup.id).then(() => {
-					TreeUpdateUtils.registeredServerUpdate(tree, self._connectionManagementService, targetConnectionProfileGroup);
-				});
-			} else if (source instanceof ConnectionProfileGroup) {
-				// Change parent id of group
-				this._connectionManagementService.changeGroupIdForConnectionGroup(source, targetConnectionProfileGroup).then(() => {
-					TreeUpdateUtils.registeredServerUpdate(tree, self._connectionManagementService);
-				});
+				if (source instanceof ConnectionProfile) {
+					// Change group id of profile
+					this._connectionManagementService.changeGroupIdForConnection(source, targetConnectionProfileGroup.id).then(() => {
+						TreeUpdateUtils.registeredServerUpdate(tree, self._connectionManagementService, targetConnectionProfileGroup);
+					});
+				} else if (source instanceof ConnectionProfileGroup) {
+					// Change parent id of group
+					this._connectionManagementService.changeGroupIdForConnectionGroup(source, targetConnectionProfileGroup).then(() => {
+						TreeUpdateUtils.registeredServerUpdate(tree, self._connectionManagementService);
+					});
+				}
 			}
 		}
-
-		return;
 	}
 
 	public dropAbort(tree: ITree, data: IDragAndDropData): void {