diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
index 394c16ca..e701c0fc 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
@@ -1595,17 +1595,27 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 	 */
 	@Override
 	public Map<String, Object> getEvaluasiJabatanPegawaiBaru(List<Integer> listIdJabatan) {
+		Map<String, Object> result = new HashMap<>();
+
 		List<Map<String, Object>> data = mapPegawaiJabatanToUnitKerjaDao
 				.findEvaluasiJabatanByAllJabatanPegawaiBaru(listIdJabatan);
+		if (CommonUtil.isNotNullOrEmpty(data)) {
+			result = data.get(0);
+		}
 
-		return data.get(0);
+		return result;
 	}
 
 	@Override
 	public Map<String, Object> getEvaluasiJabatanByPegawai(Integer idPegawai) {
-		List<Map<String, Object>> data = mapPegawaiJabatanToUnitKerjaDao.findEvaluasiJabatanByPegawai(idPegawai);
+		Map<String, Object> result = new HashMap<>();
 
-		return data.get(0);
+		List<Map<String, Object>> data = mapPegawaiJabatanToUnitKerjaDao.findEvaluasiJabatanByPegawai(idPegawai);
+		if (CommonUtil.isNotNullOrEmpty(data)) {
+			result = data.get(0);
+		}
+
+		return result;
 	}
 
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
index 06aaf6e3..827ea1a1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
@@ -2367,9 +2367,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 	 */
 	@Override
 	public Map<String, Object> getEvaluasiJabatanByPegawai(Integer idPegawai) {
-		List<Map<String, Object>> data = mapPegawaiJabatanToUnitKerjaDao.findEvaluasiJabatanByPegawai(idPegawai);
+		Map<String, Object> result = new HashMap<>();
 
-		return data.get(0);
+		List<Map<String, Object>> data = mapPegawaiJabatanToUnitKerjaDao.findEvaluasiJabatanByPegawai(idPegawai);
+		if (CommonUtil.isNotNullOrEmpty(data)) {
+			result = data.get(0);
+		}
+
+		return result;
 	}
 
 }