diff --git a/build.gradle b/build.gradle
index 1ea2c5d..94b64d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,7 +101,9 @@ publishMods {
 	modLoaders.add("fabric")
 
 	modrinth {
-		accessToken = providers.gradleProperty("modrinth_token").get()
+		if (providers.gradleProperty("modrinth_token").isPresent()) {
+			accessToken = providers.gradleProperty("modrinth_token").get()
+		}
 		projectId = "B1CcCd9h"
 		minecraftVersionRange {
 			start = "1.20"
@@ -112,4 +114,4 @@ publishMods {
 		requires("sushi-bar")
 		optional("modmenu")
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/chailotl/particular/mixin/InjectEntity.java b/src/main/java/com/chailotl/particular/mixin/InjectEntity.java
index 6f9c251..2335b9d 100644
--- a/src/main/java/com/chailotl/particular/mixin/InjectEntity.java
+++ b/src/main/java/com/chailotl/particular/mixin/InjectEntity.java
@@ -24,6 +24,8 @@
 import java.util.LinkedList;
 import java.util.Queue;
 
+import java.util.NoSuchElementException;
+
 @Mixin(Entity.class)
 public abstract class InjectEntity
 {
@@ -86,7 +88,14 @@ private void waterParticles(CallbackInfo ci)
 
 		if (!foundSurface) { return; }
 
+		double splashVelocity;
+		try {
+			splashVelocity = Collections.max(velocities);
+		} catch (NoSuchElementException e) {
+			splashVelocity = 0.1;
+		}
+
 		// 3D splash
-		getWorld().addParticle(Particles.WATER_SPLASH_EMITTER, getX(), baseY + prevState.getHeight(), getZ(), dimensions.width, Collections.max(velocities), 0.0);
+		getWorld().addParticle(Particles.WATER_SPLASH_EMITTER, getX(), baseY + prevState.getHeight(), getZ(), dimensions.width, splashVelocity, 0.0);
 	}
-}
\ No newline at end of file
+}