diff --git a/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/propertygraph/rowwriters/CustomSchemaRowWriter.java b/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/propertygraph/rowwriters/CustomSchemaRowWriter.java
index ed0004ecc0..8dc991a741 100644
--- a/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/propertygraph/rowwriters/CustomSchemaRowWriter.java
+++ b/athena-neptune/src/main/java/com/amazonaws/athena/connectors/neptune/propertygraph/rowwriters/CustomSchemaRowWriter.java
@@ -40,6 +40,8 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.tinkerpop.gremlin.structure.T;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -52,6 +54,7 @@
  */
 public final class CustomSchemaRowWriter 
 {
+    private static final Logger logger = LoggerFactory.getLogger(CustomSchemaRowWriter.class);
     private CustomSchemaRowWriter() 
     {
         // Empty private constructor
@@ -61,8 +64,10 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
     {
         ArrowType arrowType = field.getType();
         Types.MinorType minorType = Types.getMinorTypeForArrowType(arrowType);
+        logger.debug("writeRowTemplate*" + field.getName() + "*" + minorType + "*");
         Boolean enableCaseinsensitivematch = (configOptions.get(Constants.SCHEMA_CASE_INSEN) == null) ? true : Boolean.parseBoolean(configOptions.get(Constants.SCHEMA_CASE_INSEN));
 
+        try {
         switch (minorType) {
             case BIT:
                 rowWriterBuilder.withExtractor(field.getName(),
@@ -72,6 +77,9 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             value.isSet = 0;
 
                             Object fieldValue = obj.get(fieldName);
+                            logger.debug("writeRowTemplate BIT*" + field.getName() + "*" + minorType + "*"
+                                    + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
+
                             if (fieldValue.getClass().equals(Boolean.class)) {                              
                                 Boolean booleanValue = Boolean.parseBoolean(fieldValue.toString());
                                 value.value = booleanValue ? 1 : 0;
@@ -105,20 +113,26 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             } 
                             else {
                                 Object fieldValue = obj.get(fieldName);
+                                logger.debug("writeRowTemplate VARCHAR*" + field.getName() + "*" + minorType + "*"
+                                        + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
 
                                 if (fieldValue != null) {
                                     if (fieldValue.getClass().equals(String.class)) {
                                         value.value = fieldValue.toString();
                                         value.isSet = 1;
                                     }
-                                    else {       
+                                    else if (fieldValue instanceof ArrayList) {
                                         ArrayList<Object> objValues = (ArrayList) fieldValue;
                                         if (objValues != null && objValues.get(0) != null) {
                                             value.value = objValues.get(0).toString();
                                             value.isSet = 1;
                                         }
                                     }
-                                }   
+                                    else {
+                                        value.value = "" + fieldValue;
+                                        value.isSet = 1;
+                                    }
+                                }
                             }
                         });
                 break;
@@ -131,6 +145,8 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             value.isSet = 0;
 
                             Object fieldValue = obj.get(fieldName);
+                            logger.debug("writeRowTemplate DATEMILLI*" + field.getName() + "*" + minorType + "*"
+                                    + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
                             if (fieldValue.getClass().equals(Date.class)) {                              
                                 value.value = ((Date) fieldValue).getTime();
                                 value.isSet = 1;
@@ -153,11 +169,13 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             value.isSet = 0;
 
                             Object fieldValue = obj.get(fieldName);
-                            if (fieldValue.getClass().equals(Integer.class)) {                              
+                            logger.debug("writeRowTemplate INT*" + field.getName() + "*" + minorType + "*"
+                                    + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
+                            if (fieldValue.getClass().equals(Integer.class)) {
                                 value.value = Integer.parseInt(fieldValue.toString());
                                 value.isSet = 1;
                             }
-                            else {  
+                            else if (fieldValue instanceof ArrayList) {
                                 ArrayList<Object> objValues = (ArrayList) fieldValue;
                                 if (objValues != null && objValues.get(0) != null && !(objValues.get(0).toString().trim().isEmpty())) {
                                     value.value = Integer.parseInt(objValues.get(0).toString());
@@ -175,11 +193,13 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             value.isSet = 0;
 
                             Object fieldValue = obj.get(fieldName);
-                            if (fieldValue.getClass().equals(Long.class)) {                              
+                            logger.debug("writeRowTemplate BIGINT*" + field.getName() + "*" + minorType + "*"
+                                    + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
+                            if (fieldValue.getClass().equals(Long.class)) {
                                 value.value = Long.parseLong(fieldValue.toString());
                                 value.isSet = 1;
                             }
-                            else { 
+                            else if (fieldValue instanceof ArrayList) {
                                 ArrayList<Object> objValues = (ArrayList) fieldValue;
                                 if (objValues != null && objValues.get(0) != null && !(objValues.get(0).toString().trim().isEmpty())) {
                                     value.value = Long.parseLong(objValues.get(0).toString());
@@ -197,11 +217,13 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             value.isSet = 0;
 
                             Object fieldValue = obj.get(fieldName);
-                            if (fieldValue.getClass().equals(Float.class)) {                              
+                            logger.debug("writeRowTemplate FLOAT4*" + field.getName() + "*" + minorType + "*"
+                                    + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
+                            if (fieldValue.getClass().equals(Float.class)) {
                                 value.value = Float.parseFloat(fieldValue.toString());
                                 value.isSet = 1;
                             }
-                            else { 
+                            else if (fieldValue instanceof ArrayList) {
                                 ArrayList<Object> objValues = (ArrayList) fieldValue;
                                 if (objValues != null && objValues.get(0) != null && !(objValues.get(0).toString().trim().isEmpty())) {
                                     value.value = Float.parseFloat(objValues.get(0).toString());
@@ -218,12 +240,14 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
                             Map<String, Object> obj = (Map<String, Object>) contextAsMap(context, enableCaseinsensitivematch);
                             value.isSet = 0;
 
-                            Object fieldValue = obj.get(field.getName());
-                            if (fieldValue.getClass().equals(Double.class)) {                              
+                            Object fieldValue = obj.get(fieldName);
+                            logger.debug("writeRowTemplate FLOAT8*" + field.getName() + "*" + minorType + "*"
+                                    + fieldValue + "*" + (fieldValue == null ? "" : fieldValue.getClass()) + "*");
+                            if (fieldValue.getClass().equals(Double.class)) {
                                 value.value = Double.parseDouble(fieldValue.toString());
                                 value.isSet = 1;
                             }
-                            else { 
+                            else if (fieldValue instanceof ArrayList) {
                                 ArrayList<Object> objValues = (ArrayList) fieldValue;
                                 if (objValues != null && objValues.get(0) != null && !(objValues.get(0).toString().trim().isEmpty())) {
                                     value.value = Double.parseDouble(objValues.get(0).toString());
@@ -234,6 +258,11 @@ public static void writeRowTemplate(RowWriterBuilder rowWriterBuilder, Field fie
 
                 break;
         }
+        }
+        catch (Throwable e) {
+            logger.error("writeRowTemplate exception for *" + field.getName() + "*" + minorType + "*", e);
+            //throw new RuntimeException(e);
+        }
     }
 
     private static Map<String, Object> contextAsMap(Object context, boolean caseInsensitive)