diff --git a/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java b/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java
index 3803624f..a441714d 100644
--- a/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java
+++ b/src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java
@@ -60,6 +60,8 @@ public class EntityMessageBuilder implements MessageBuilder {
 				logger.error(e.getMessage());
 			} catch (NoSuchMethodException e) {
 				logger.error(e.getMessage());
+			} catch (NullPointerException e) {
+				logger.error("Null pointer - property: " + p);
 			}
 		}
 		
diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
index f35acb75..2e9f171d 100644
--- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java
@@ -118,7 +118,7 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
 		cal.setTime(back);
 		
 		if (back.equals(to)) {
-			cal.set(Calendar.HOUR, 23);
+			cal.set(Calendar.HOUR_OF_DAY, 23);
 			cal.set(Calendar.MINUTE, 59);
 		}