diff --git a/library/src/configuration.cpp b/library/src/configuration.cpp
index c9f9353..7324491 100644
--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
@@ -171,8 +171,9 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                                 if (!d.isNull() && d.isValid()) {
                                                                     TariffPrepaid.m_date = d;
                                                                 }
-                                                                TariffPrepaid.setPrepaidIf(prepaidIf);
-
+                                                                if (!prepaidIf.isNull() && !prepaidIf.trimmed().isEmpty()) {
+                                                                    TariffPrepaid.setPrepaidIf(prepaidIf);
+                                                                }
                                                                 qCritical() << TariffPrepaid;
 
                                                                 cfg.TariffPrepaids.insert(std::pair<int, ATBTariffPrepaid>(weekDay, TariffPrepaid));
@@ -258,7 +259,7 @@ ATBWeekDay parseWeekDay(Configuration &cfg,
                                                                 if (!d.isNull() && d.isValid()) {
                                                                     TariffCarryOver.m_date = d;
                                                                 }
-                                                                if (!carryOverIf.isEmpty()) {
+                                                                if (!carryOverIf.isNull() && !carryOverIf.trimmed().isEmpty()) {
                                                                     TariffCarryOver.setCarryOverIf(carryOverIf);
                                                                 }