diff --git a/src/rugby-list-store.c b/src/rugby-list-store.c
index 95b1f1fa74268e53f45c85c284b1663fb19bfd19..b84753d2f742a4b3a944481868fa86461fb890d0 100644
--- a/src/rugby-list-store.c
+++ b/src/rugby-list-store.c
@@ -121,7 +121,7 @@ rugby_list_store_get_item (GListModel *list,
 {
     RugbyListStore *self = RUGBY_LIST_STORE (list);
 
-    g_return_val_if_fail (position < self->items->len, NULL);
+    g_assert (position < self->items->len);
 
     return g_object_ref (g_ptr_array_index (self->items, position));
 }
@@ -217,7 +217,7 @@ rugby_list_store_init (RugbyListStore *self)
 int
 rugby_list_store_get_score (RugbyListStore *self)
 {
-    g_return_val_if_fail (RUGBY_IS_LIST_STORE (self), 0);
+    g_assert (RUGBY_IS_LIST_STORE (self));
 
     return self->score;
 }
@@ -226,7 +226,7 @@ void
 rugby_list_store_set_score (RugbyListStore *self,
                             int             score)
 {
-    g_return_if_fail (RUGBY_IS_LIST_STORE (self));
+    g_assert (RUGBY_IS_LIST_STORE (self));
 
     if (score != self->score)
     {