diff --git a/resources/views/modules/form/table.blade.php b/resources/views/modules/form/table.blade.php
index 9522464..0ffc607 100644
--- a/resources/views/modules/form/table.blade.php
+++ b/resources/views/modules/form/table.blade.php
@@ -21,7 +21,7 @@
                                 <select name="unit_code[{{ $detail->activity_code }}]" class="form-control unit-code"
                                     data-activity-code="{{ $detail->activity_code }}"
                                     data-current-unit="{{ $unitCode }}">
-                                    @foreach ($unitsByCategory[$unitCategory] as $unit)
+                                    @foreach ($unitsByCategory[$unitCategory] ?? [] as $unit)
                                         <option value="{{ $unit->code }}"
                                             {{ $unit->code == $unitCode ? 'selected' : '' }}>
                                             {{ $unit->code }}
@@ -46,12 +46,23 @@
                         @foreach ($formDetails as $detail)
                             @php
 
-                                $activity_value = isset($activityFormDetails[$year])
-                                    ? $activityFormDetails[$year]
-                                            ->where('activity_code', $detail->activity_code)
-                                            ->where('activity_unit_code', $detail->unit_code)
-                                            ->first()->activity_value ?? ''
-                                    : '';
+                            $activity_value = '';
+
+                            if (isset($activityFormDetails[$year])) {
+                                $activityData = $activityFormDetails[$year]
+                                    ->where('activity_code', $detail->activity_code)
+                                    ->where('activity_unit_code', $detail->unit_code)
+                                    ->first();
+
+                                $activity_value = $activityData->activity_value ?? '';
+                            }
+
+                                // $activity_value = isset($activityFormDetails[$year])
+                                //     ? $activityFormDetails[$year]
+                                //             ->where('activity_code', $detail->activity_code)
+                                //             ->where('activity_unit_code', $detail->unit_code)
+                                //             ->first()->activity_value ?? ''
+                                //     : '';
                             @endphp
                             <td>
                                 <div class="input-group">