diff --git a/src/compile/nodes/shared/Expression.ts b/src/compile/nodes/shared/Expression.ts
index 18a1b20819..facc33ad25 100644
--- a/src/compile/nodes/shared/Expression.ts
+++ b/src/compile/nodes/shared/Expression.ts
@@ -109,7 +109,10 @@ export default class Expression {
 				if (isReference(node, parent)) {
 					const { name, nodes } = flattenReference(node);
 
-					if (currentScope.has(name)) return;
+					if (currentScope.has(name)) {
+						contextual_dependencies.add(name);
+						return;
+					}
 
 					if (component.helpers.has(name)) {
 						let object = node;
@@ -121,7 +124,6 @@ export default class Expression {
 					}
 
 					expression.usesContext = true;
-					contextual_dependencies.add(name);
 
 					if (!isSynthetic && !isEventHandler) {
 						// <option> value attribute could be synthetic — avoid double editing
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compile/render-dom/wrappers/Element/index.ts
index 34061db98b..11f83a2390 100644
--- a/src/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compile/render-dom/wrappers/Element/index.ts
@@ -650,9 +650,9 @@ export default class ElementWrapper extends Wrapper {
 					});
 
 					block.builders.init.addBlock(deindent`
-						${name}.$on("${handler.name}", function(event) {
+						function ${name}(event) {
 							ctx.${handler_name}.call(this, event, ctx);
-						});
+						}
 					`);
 				} else {
 					name = `ctx.${handler_name}`;
diff --git a/src/internal/SvelteComponent.js b/src/internal/SvelteComponent.js
index 9a73110896..c9bc5dc1f7 100644
--- a/src/internal/SvelteComponent.js
+++ b/src/internal/SvelteComponent.js
@@ -71,10 +71,12 @@ export class SvelteComponent {
 	}
 
 	$set(values) {
-		this.$$.inject_props(values);
-		run_all(this.$$onprops);
+		if (this.$$) {
+			this.$$.inject_props(values);
+			run_all(this.$$onprops);
 
-		for (const key in values) this.$$make_dirty(key);
+			for (const key in values) this.$$make_dirty(key);
+		}
 	}
 
 	$$update() {
@@ -85,10 +87,12 @@ export class SvelteComponent {
 	}
 
 	$$destroy(detach) {
-		this.$$fragment.d(detach);
-		run_all(this.$$ondestroy);
+		if (this.$$) {
+			this.$$fragment.d(detach);
+			run_all(this.$$ondestroy);
 
-		// TODO null out other refs
-		this.$$ondestroy = null;
+			// TODO null out other refs
+			this.$$ondestroy = this.$$fragment = this.$$ = null;
+		}
 	}
 }
\ No newline at end of file