diff --git a/craftbook-sponge/src/main/java/com/sk89q/craftbook/sponge/util/locale/TranslationsManager.java b/craftbook-sponge/src/main/java/com/sk89q/craftbook/sponge/util/locale/TranslationsManager.java
index 1aaf4381dc..40e8762783 100644
--- a/craftbook-sponge/src/main/java/com/sk89q/craftbook/sponge/util/locale/TranslationsManager.java
+++ b/craftbook-sponge/src/main/java/com/sk89q/craftbook/sponge/util/locale/TranslationsManager.java
@@ -41,7 +41,8 @@ public class TranslationsManager {
     private static LoadingCache<Locale, ResourceBundle> resourceBundleCache = CacheBuilder.newBuilder().build(new ResourceBundleLoader());
 
     public static void initialize() {
-        resourceBundleFunction = locale -> Optional.of(resourceBundleCache.getUnchecked(locale)).orElse(resourceBundleCache.getUnchecked(Locales.EN_US));
+        resourceBundleFunction = locale -> Optional.ofNullable(resourceBundleCache.getUnchecked(locale))
+                .orElse(resourceBundleCache.getUnchecked(Locales.EN_US));
 
         USE_PERMISSIONS = TranslatableText.builder(new ResourceBundleTranslation("mechanic.use-permissions", resourceBundleFunction)).color(TextColors.RED).build();
     }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b323630f44..6b6ea3ab4f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0fa060ed2d..0e680f3759 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Jan 09 20:09:13 AEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
diff --git a/gradlew b/gradlew
index 4453ccea33..cccdd3d517 100755
--- a/gradlew
+++ b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }