diff --git a/lib/client.js b/lib/client.js
index 98fa17aac..4b5575a5d 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -725,7 +725,7 @@ MatrixClient.prototype.setAvatarUrl = function(url, callback) {
  */
 MatrixClient.prototype.getAvatarUrlForMember =
         function(member, width, height, resizeMethod) {
-    if (!member.events.member) {
+    if (!member || !member.events.member) {
         return null;
     }
     var rawUrl = member.events.member.getContent().avatar_url;
@@ -747,6 +747,10 @@ MatrixClient.prototype.getAvatarUrlForMember =
 MatrixClient.prototype.getAvatarUrlForRoom =
         function(room, width, height, resizeMethod) {
 
+    if (!room || !room.currentState || !room.currentState.members) {
+        return null;
+    }
+
     var userId = this.credentials.userId;
     var members = utils.filter(room.currentState.getMembers(), function(m) {
         return (m.membership === "join" && m.userId !== userId);