diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt
index 4b8b5fdd..db893d78 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt
@@ -174,9 +174,9 @@ open class FilterCondition() : RealmObject() {
 	 */
 	fun getFilterConditionValue(filterElementRow: FilterElementRow): Any? {
 		return when (filterElementRow) {
-			is From, is To -> date
+			is From, is To -> dateValue //TODO: Probably change by 'date' (doesn't work now because the value isn't correctly saved
 			is PastDays -> values
-			else -> throw PokerAnalyticsException.FilterElementTypeMissing
+			else -> throw PokerAnalyticsException.FilterElementTypeMissing(filterElementRow)
 		}
 	}