diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
index 80d022e1..18f4fe2d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
@@ -289,7 +289,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 			if (!listKdShift.contains(xvo.getKdShift())) {
 				listKdShift.add(xvo.getKdShift().toLowerCase());
 			}
-			if (!listIdPegawai.contains(xvo.getPegawai().getId())) {
+			if (CommonUtil.isNotNullOrEmpty(xvo.getPegawai()) && CommonUtil.isNotNullOrEmpty(xvo.getPegawai().getId())
+					&& !listIdPegawai.contains(xvo.getPegawai().getId())) {
 				listIdPegawai.add(xvo.getPegawai().getId());
 			}
 		}