diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/ManagerParameters.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/ManagerParameters.java
index 811d036c0..42fa0d055 100644
--- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/ManagerParameters.java
+++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/ManagerParameters.java
@@ -63,7 +63,7 @@ public static ManagerParameter create(final Locale locale) {
    * @return an {@link CalendarPartManagerParameter} based on {@link ManagerParameter}
    */
   public static ManagerParameter create(final Locale locale, final Properties properties) {
-    final String calendarPart = "".equals(locale.getCountry()) ? locale.getLanguage() : locale.getCountry();
+    final String calendarPart = locale.getCountry().isEmpty() ? locale.getLanguage() : locale.getCountry();
     return create(calendarPart, properties);
   }
 
diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/configuration/URLConfigurationProvider.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/configuration/URLConfigurationProvider.java
index 21fb1cd15..c33488d3f 100644
--- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/configuration/URLConfigurationProvider.java
+++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/configuration/URLConfigurationProvider.java
@@ -33,7 +33,6 @@ public Properties getProperties() {
 
     if (configURLs != null) {
       stream(configURLs.split(","))
-        .filter(Objects::nonNull)
         .filter(not(String::isEmpty))
         .map(String::trim)
         .map(this::createUrl)
diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/support/LazyServiceLoaderCache.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/support/LazyServiceLoaderCache.java
index ae5fbd765..0da3061cf 100644
--- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/support/LazyServiceLoaderCache.java
+++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/support/LazyServiceLoaderCache.java
@@ -11,6 +11,7 @@
 import static java.lang.String.format;
 
 public class LazyServiceLoaderCache<S> {
+
   private static final Logger LOG = LoggerFactory.getLogger(LazyServiceLoaderCache.class.getName());
 
   private final Class<S> clz;