diff --git a/attendance/templates/attendance/attendance_activity/import_activity.html b/attendance/templates/attendance/attendance_activity/import_activity.html
index 0444f07a5..1110e8453 100644
--- a/attendance/templates/attendance/attendance_activity/import_activity.html
+++ b/attendance/templates/attendance/attendance_activity/import_activity.html
@@ -75,4 +75,4 @@
             $('#uploading').show();
         });
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/attendance/views/clock_in_out.py b/attendance/views/clock_in_out.py
index 9d107f58e..d936dc28b 100644
--- a/attendance/views/clock_in_out.py
+++ b/attendance/views/clock_in_out.py
@@ -76,7 +76,7 @@ def late_come(attendance, start_time, end_time, shift):
     mid_day_sec = strtime_seconds("12:00")
 
     # Checking gracetime allowance before creating late come
-    if shift.grace_time_id:
+    if shift and shift.grace_time_id:
         # checking grace time in shift, it has the higher priority
         if (
             shift.grace_time_id.is_active == True