diff --git a/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java b/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java
index 0160150558..0eb9d1e345 100644
--- a/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java
+++ b/serving/src/main/java/feast/serving/controller/ServingServiceGRpcController.java
@@ -74,6 +74,7 @@ public void getOnlineFeatures(
       responseObserver.onNext(onlineFeatures);
       responseObserver.onCompleted();
     } catch (Exception e) {
+      log.warn("Failed to get Online Features", e);
       responseObserver.onError(e);
     }
     span.finish();
@@ -88,6 +89,7 @@ public void getBatchFeatures(
       responseObserver.onNext(batchFeatures);
       responseObserver.onCompleted();
     } catch (Exception e) {
+      log.warn("Failed to get Batch Features", e);
       responseObserver.onError(e);
     }
   }
@@ -99,6 +101,7 @@ public void getJob(GetJobRequest request, StreamObserver<GetJobResponse> respons
       responseObserver.onNext(response);
       responseObserver.onCompleted();
     } catch (Exception e) {
+      log.warn("Failed to get Job", e);
       responseObserver.onError(e);
     }
   }
diff --git a/serving/src/main/java/feast/serving/service/BigQueryServingService.java b/serving/src/main/java/feast/serving/service/BigQueryServingService.java
index 701e146ee5..d1658bde54 100644
--- a/serving/src/main/java/feast/serving/service/BigQueryServingService.java
+++ b/serving/src/main/java/feast/serving/service/BigQueryServingService.java
@@ -123,7 +123,19 @@ public GetBatchFeaturesResponse getBatchFeatures(GetBatchFeaturesRequest getFeat
           .asRuntimeException();
     }
 
-    Table entityTable = loadEntities(getFeaturesRequest.getDatasetSource());
+    Table entityTable;
+    String entityTableName;
+    try {
+      entityTable = loadEntities(getFeaturesRequest.getDatasetSource());
+
+      TableId entityTableWithUUIDs = generateUUIDs(entityTable);
+      entityTableName = generateFullTableName(entityTableWithUUIDs);
+    } catch (Exception e) {
+      throw Status.INTERNAL
+          .withDescription("Unable to load entity dataset to Bigquery")
+          .asRuntimeException();
+    }
+
     Schema entityTableSchema = entityTable.getDefinition().getSchema();
     List<String> entityNames =
         entityTableSchema.getFields().stream()
@@ -131,9 +143,6 @@ public GetBatchFeaturesResponse getBatchFeatures(GetBatchFeaturesRequest getFeat
             .filter(name -> !name.equals("event_timestamp"))
             .collect(Collectors.toList());
 
-    TableId entityTableWithUUIDs = generateUUIDs(entityTable);
-    String entityTableName = generateFullTableName(entityTableWithUUIDs);
-
     List<FeatureSetInfo> featureSetInfos =
         QueryTemplater.getFeatureSetInfos(featureSetSpecs, getFeaturesRequest.getFeatureSetsList());