diff --git a/src/add-ons/accelerants/intel_extreme/mode.cpp b/src/add-ons/accelerants/intel_extreme/mode.cpp
index 257ce266ce..a315ccec4a 100644
--- a/src/add-ons/accelerants/intel_extreme/mode.cpp
+++ b/src/add-ons/accelerants/intel_extreme/mode.cpp
@@ -423,12 +423,12 @@ intel_propose_display_mode(display_mode* target, const display_mode* low,
 status_t
 intel_set_display_mode(display_mode* mode)
 {
-	TRACE("%s(%" B_PRIu16 "x%" B_PRIu16 ")\n", __func__,
-		mode->virtual_width, mode->virtual_height);
-
 	if (mode == NULL)
 		return B_BAD_VALUE;
 
+	TRACE("%s(%" B_PRIu16 "x%" B_PRIu16 ")\n", __func__,
+		mode->virtual_width, mode->virtual_height);
+
 	display_mode target = *mode;
 
 	// TODO: it may be acceptable to continue when using panel fitting or
diff --git a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
index 6297056d1c..22c90d324a 100644
--- a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
@@ -685,23 +685,25 @@ TeamDescriptionView::SetItem(TeamListItem* item)
 	fItem = item;
 
 	if (item == NULL) {
-		int32 styleStart = 0;
-		int32 styleEnd = 0;
-		BString text;
+		if (fInfoTextView != NULL) {
+			int32 styleStart = 0;
+			int32 styleEnd = 0;
+			BString text;
 
-		text.SetToFormat(fInfoString, fSeconds);
-		fInfoTextView->SetText(text);
-		if (fRebootRunner != NULL && fSeconds < 4) {
-			styleStart = text.FindLast('\n');
-			styleEnd = text.Length();
-		}
+			text.SetToFormat(fInfoString, fSeconds);
+			fInfoTextView->SetText(text);
+			if (fRebootRunner != NULL && fSeconds < 4) {
+				styleStart = text.FindLast('\n');
+				styleEnd = text.Length();
+			}
 
-		if (styleStart != styleEnd && fInfoTextView != NULL) {
-			BFont font;
-			fInfoTextView->GetFont(&font);
-			font.SetFace(B_BOLD_FACE);
-			fInfoTextView->SetStylable(true);
-			fInfoTextView->SetFontAndColor(styleStart, styleEnd, &font);
+			if (styleStart != styleEnd) {
+				BFont font;
+				fInfoTextView->GetFont(&font);
+				font.SetFace(B_BOLD_FACE);
+				fInfoTextView->SetStylable(true);
+				fInfoTextView->SetFontAndColor(styleStart, styleEnd, &font);
+			}
 		}
 	} else {
 		fTeamName->SetText(item->Path()->Path());
diff --git a/src/add-ons/kernel/busses/virtio/virtio_pci.cpp b/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
index 5284d9940d..acdd32efce 100644
--- a/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
+++ b/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
@@ -506,10 +506,13 @@ uninit_bus(void* bus_cookie)
 			remove_io_interrupt_handler(bus->irq, virtio_pci_config_interrupt,
 					bus);
 		}
-		sPCIx86Module->disable_msi(bus->info.bus,
-			bus->info.device, bus->info.function);
-		sPCIx86Module->unconfigure_msi(bus->info.bus,
-			bus->info.device, bus->info.function);
+
+		if (sPCIx86Module != NULL) {
+			sPCIx86Module->disable_msi(bus->info.bus,
+				bus->info.device, bus->info.function);
+			sPCIx86Module->unconfigure_msi(bus->info.bus,
+				bus->info.device, bus->info.function);
+		}
 	} else
 		remove_io_interrupt_handler(bus->irq, virtio_pci_interrupt, bus);
 	if (sPCIx86Module != NULL) {
diff --git a/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp b/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
index a54ae3b85b..6330f3319c 100644
--- a/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
+++ b/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
@@ -1219,7 +1219,7 @@ hda_hw_uninit(hda_controller* controller)
 	// Disable interrupts, and remove interrupt handler
 	controller->Write32(HDAC_INTR_CONTROL, 0);
 
-	if (controller->msi) {
+	if (controller->msi && gPCIx86Module != NULL) {
 		// Disable MSI
 		gPCIx86Module->disable_msi(controller->pci_info.bus,
 			controller->pci_info.device, controller->pci_info.function);
diff --git a/src/add-ons/kernel/file_systems/fat/file.c b/src/add-ons/kernel/file_systems/fat/file.c
index be82ba905c..2ff0650f36 100644
--- a/src/add-ons/kernel/file_systems/fat/file.c
+++ b/src/add-ons/kernel/file_systems/fat/file.c
@@ -135,15 +135,15 @@ dosfs_release_vnode(fs_volume *_vol, fs_vnode *_node, bool reenter)
 
 	TOUCH(reenter);
 
-	DPRINTF(0, ("dosfs_release_vnode (ino_t %" B_PRIdINO ")\n", node->vnid));
-
-	if ((vol->fs_flags & FS_FLAGS_OP_SYNC) && node->dirty) {
-		LOCK_VOL(vol);
-		_dosfs_sync(vol);
-		UNLOCK_VOL(vol);
-	}
-
 	if (node != NULL) {
+		DPRINTF(0, ("dosfs_release_vnode (ino_t %" B_PRIdINO ")\n", node->vnid));
+
+		if ((vol->fs_flags & FS_FLAGS_OP_SYNC) && node->dirty) {
+			LOCK_VOL(vol);
+			_dosfs_sync(vol);
+			UNLOCK_VOL(vol);
+		}
+
 #if TRACK_FILENAME
 		if (node->filename) free(node->filename);
 #endif