diff --git a/src/main/java/info/bukova/isspst/ui/ListViewModel.java b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
index c2c52cb8..a0106159 100644
--- a/src/main/java/info/bukova/isspst/ui/ListViewModel.java
+++ b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
@@ -216,7 +216,7 @@ public class ListViewModel<T extends DataModel> {
 		if (editBean != null && !editBean.isValid()) {
 			return;
 		}
-		if (editBean.getCreated() == null) {
+		if (editBean != null && editBean.getCreated() == null) {
 			return;
 		}
 		if (!filter && newRec) {
@@ -228,7 +228,7 @@ public class ListViewModel<T extends DataModel> {
 			fullList.add(editBean);
 		}
 		dataBean = editBean;
-		if (!newRec) {
+		if (!newRec && editBean != null) {
 			dataList.set(selIndex, editBean);
 		}
 	}