diff --git a/src/database/globals.rs b/src/database/globals.rs
index 30bf9373..de5b2502 100644
--- a/src/database/globals.rs
+++ b/src/database/globals.rs
@@ -144,7 +144,7 @@ impl Globals {
             RoomVersionId::Version5,
         ];
 
-        let s = Self {
+        let mut s = Self {
             globals,
             config,
             keypair: Arc::new(keypair),
@@ -169,6 +169,14 @@ impl Globals {
 
         fs::create_dir_all(s.get_media_folder())?;
 
+        if !s
+            .supported_room_versions()
+            .contains(&s.config.default_room_version)
+        {
+            error!("Room version in config isn't supported, falling back to Version 6");
+            s.config.default_room_version = RoomVersionId::Version6;
+        };
+
         Ok(s)
     }
 
@@ -233,15 +241,7 @@ impl Globals {
     }
 
     pub fn default_room_version(&self) -> RoomVersionId {
-        if self
-            .supported_room_versions()
-            .contains(&self.config.default_room_version.clone())
-        {
-            self.config.default_room_version.clone()
-        } else {
-            error!("Room version in config isn't supported, falling back to Version 6");
-            RoomVersionId::Version6
-        }
+        self.config.default_room_version.clone()
     }
 
     pub fn trusted_servers(&self) -> &[Box<ServerName>] {
@@ -278,13 +278,9 @@ impl Globals {
 
     pub fn supported_room_versions(&self) -> Vec<RoomVersionId> {
         let mut room_versions: Vec<RoomVersionId> = vec![];
-        self.stable_room_versions
-            .iter()
-            .for_each(|room_version| room_versions.push(room_version.clone()));
+        room_versions.extend(self.stable_room_versions.clone());
         if self.allow_unstable_room_versions() {
-            self.unstable_room_versions
-                .iter()
-                .for_each(|room_version| room_versions.push(room_version.clone()));
+            room_versions.extend(self.unstable_room_versions.clone());
         };
         room_versions
     }
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 1b956eb1..a0455dbf 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -3454,10 +3454,8 @@ impl Rooms {
 
     /// Returns the room's version.
     #[tracing::instrument(skip(self))]
-    pub fn get_room_version(&self, room_id: &RoomId) -> RoomVersionId {
-        let create_event = self
-            .room_state_get(room_id, &EventType::RoomCreate, "")
-            .unwrap();
+    pub fn get_room_version(&self, room_id: &RoomId) -> Result<RoomVersionId> {
+        let create_event = self.room_state_get(room_id, &EventType::RoomCreate, "")?;
 
         let create_event_content: Option<RoomCreateEventContent> = create_event
             .as_ref()
@@ -3467,11 +3465,10 @@ impl Rooms {
                     Error::bad_database("Invalid create event in db.")
                 })
             })
-            .transpose()
-            .unwrap();
-
-        create_event_content
+            .transpose()?;
+        let room_version = create_event_content
             .map(|create_event| create_event.room_version)
-            .expect("Invalid room version")
+            .ok_or_else(|| Error::BadDatabase("Invalid room version"))?;
+        Ok(room_version)
     }
 }
diff --git a/src/pdu.rs b/src/pdu.rs
index bcd52edd..6fe322a3 100644
--- a/src/pdu.rs
+++ b/src/pdu.rs
@@ -348,7 +348,7 @@ pub(crate) fn gen_event_id_canonical_json(
     let event_id = EventId::try_from(&*format!(
         "${}",
         // Anything higher than version3 behaves the same
-        ruma::signatures::reference_hash(&value, &room_version_id)
+        ruma::signatures::reference_hash(&value, &room_version_id?)
             .expect("ruma can calculate reference hashes")
     ))
     .expect("ruma's reference hashes are valid event ids");