diff --git a/crmEntity.go b/crmEntity.go
index 333d7fc..70a34b4 100644
--- a/crmEntity.go
+++ b/crmEntity.go
@@ -216,8 +216,6 @@ func crmFindEntityByID(entityType string, id string) (entity interface{}, err er
 			return
 		}
 		entity = e[0]
-	case "Account":
-		return
 	case "Livecast":
 		e := []crmdLiveCast{}
 		err = json.Unmarshal(*cs.List, &e)
@@ -225,6 +223,8 @@ func crmFindEntityByID(entityType string, id string) (entity interface{}, err er
 			return
 		}
 		entity = e[0]
+	default:
+		err = errors.New("unknown entity type " + entityType)
 	}
 	return
 }