diff --git a/freechat-client/src/cache.ts b/freechat-client/src/cache.ts
index c08ddea..fd15d85 100644
--- a/freechat-client/src/cache.ts
+++ b/freechat-client/src/cache.ts
@@ -1,4 +1,5 @@
-import * as EventEmitter from 'events'; // unused for now but maybe useful later
+import { EventEmitter } from 'events';
+//import * as EventEmitter from 'events'; // unused for now but maybe useful later
 import { ServerConfig, Message, Channel } from './types';
 import { Event } from './events';
 
@@ -46,7 +47,7 @@ class ServerCache {
 export class Cache extends EventEmitter {
 	// hostname -> Cache
     private servers: Map<String, ServerCache>
-	public active_host: String
+	public active_host: String|null
 
     constructor() {
 		super()
@@ -61,7 +62,8 @@ export class Cache extends EventEmitter {
 	}
 
 	update_channels(hostname: String, channels: Array<Channel>) : void {
-		this.servers.get(hostname).channels = channels
+		let ref = this.servers.get(hostname)
+		if(ref != undefined) { ref.channels = channels }
 	}
 
 	last_id(hostname: String, channel_id: BigInt) : BigInt|null {