diff --git a/src/preferences/virtualmemory/Settings.cpp b/src/preferences/virtualmemory/Settings.cpp
index bb143f19fb..08f6102607 100644
--- a/src/preferences/virtualmemory/Settings.cpp
+++ b/src/preferences/virtualmemory/Settings.cpp
@@ -108,8 +108,8 @@ Settings::ReadWindowSettings()
 
 	if (file.Read(&fWindowPosition, sizeof(BPoint)) == sizeof(BPoint))
 		return B_OK;
-	else
-		return B_ERROR;
+
+	return B_ERROR;
 }
 
 
@@ -197,8 +197,8 @@ Settings::ReadSwapSettings()
 
 	if (bestVol < 0)
 		return kErrorVolumeNotFound;
-	else
-		return B_OK;
+
+	return B_OK;
 }
 
 
@@ -218,7 +218,8 @@ Settings::WriteSwapSettings()
 		return B_ERROR;
 
 	fs_info info;
-	fs_stat_dev(SwapVolume(), &info);
+	if (fs_stat_dev(SwapVolume(), &info) != 0)
+		return B_ERROR;
 
 	char buffer[1024];
 	snprintf(buffer, sizeof(buffer), "vm %s\nswap_auto %s\nswap_size %lld\n"
diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp
index 6cae509dca..bddbe04bf9 100644
--- a/src/preferences/virtualmemory/SettingsWindow.cpp
+++ b/src/preferences/virtualmemory/SettingsWindow.cpp
@@ -397,8 +397,8 @@ SettingsWindow::_RemoveVolumeMenuItem(dev_t device)
 		fVolumeMenuField->Menu()->RemoveItem(item);
 		delete item;
 		return B_OK;
-	} else
-		return B_ERROR;
+	}
+	return B_ERROR;
 }
 
 
@@ -461,6 +461,7 @@ SettingsWindow::_Update()
 		fWarningStringView->Show();
 	else
 		fWarningStringView->Hide();
+
 	fRevertButton->SetEnabled(revertable);
 	fDefaultsButton->SetEnabled(fSettings.IsDefaultable());