diff --git a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
index 3f087c1..3a6e391 100644
--- a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
+++ b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
@@ -177,12 +177,19 @@ namespace TodoAPI2.Models
 
         private string ClearName(string fullname)
         {
-            return fullname.Replace(" ", "")
+            if (!string.IsNullOrEmpty(fullname))
+            {
+                return fullname.Replace(" ", "")
                 .Replace("นาย", "")
                 .Replace("นางสาว", "")
                 .Replace("นาง", "")
                 .Replace("น.ส.", "")
-                .Replace("ผศ.ดร.", ""); 
+                .Replace("ผศ.ดร.", "");
+            }
+            else
+            {
+                return fullname;
+            }            
         }
 
         private string PostAttachment(byte[] data, string filename)
@@ -219,12 +226,13 @@ namespace TodoAPI2.Models
 
             foreach (var i in model)
             {
-                var id = (from e in all_emp
+                var theemp = (from e in all_emp
                           where ClearName(i.fullname) == ClearName(e.halfname)
-                          select e.id.ToString()).FirstOrDefault().ToString();
-                if (!string.IsNullOrEmpty(id))
-                {                    
-                    var r2 = id + "#" + GetDateStringForDB(i.checktime) + "#" + GetTimeStringForDB(i.checktime);
+                          select e).FirstOrDefault();
+                if (theemp != null)
+                {
+                    var id = theemp.id.ToString();
+                    var r2 = id.ToString() + "#" + GetDateStringForDB(i.checktime) + "#" + GetTimeStringForDB(i.checktime);
                     var a = new input_finger();
                     a.data = r2;
                     a.base64_img = i.base64img;