diff --git a/src/preferences/time/NetworkTimeView.cpp b/src/preferences/time/NetworkTimeView.cpp
index c0dbfc5523..1f804776b6 100644
--- a/src/preferences/time/NetworkTimeView.cpp
+++ b/src/preferences/time/NetworkTimeView.cpp
@@ -308,13 +308,17 @@ NetworkTimeView::MessageReceived(BMessage* message)
 			break;
 
 		case kMsgRemoveServer:
+		{
+			int32 currentSelection = fServerListView->CurrentSelection();
+			if (currentSelection < 0)
+				break;
+
 			fSettings.RemoveServer(((BStringItem*)
-				fServerListView->ItemAt(
-					fServerListView->
-					CurrentSelection()))->Text());
+				fServerListView->ItemAt(currentSelection))->Text());
 			_UpdateServerList();
 			Looper()->PostMessage(new BMessage(kMsgChange));
 			break;
+		}
 
 		case kMsgResetServerList:
 			fSettings.ResetServersToDefaults();