diff --git a/src/main/java/com/bytelegend/Challenge.java b/src/main/java/com/bytelegend/Challenge.java
index 07b8b2f..983d3d4 100644
--- a/src/main/java/com/bytelegend/Challenge.java
+++ b/src/main/java/com/bytelegend/Challenge.java
@@ -11,10 +11,16 @@ public static void main(String[] args) {
     }
 
     public static Object firstOrNull(Object[] array) {
-        return array[1];
+        if (array.length == 0) {
+            return null;
+        }
+        return array[0];
     }
 
     public static Object lastOrNull(Object[] array) {
-        return array[array.length];
+        if (array.length == 0) {
+            return null;
+        }
+        return array[array.length - 1];
     }
 }