diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/I2C.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/I2C.java
index 224921ddcc..516a06bf04 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/I2C.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/I2C.java
@@ -107,7 +107,10 @@ public class I2C extends SensorBase {
 			}
 		}
 		HALUtil.checkStatus(status);*/
-		dataReceivedBuffer.get(dataReceived);
+		if(receiveSize > 0 && dataReceived != null)
+		{
+			dataReceivedBuffer.get(dataReceived);
+		}
 		return aborted;
 	}