diff --git a/README.md b/README.md
index 6446c7b8cb..a8d3a2b11e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ framework.
 ###### Gradle
 
 ```
-testImplementation 'com.tngtech.archunit:archunit:0.22.0'
+testImplementation 'com.tngtech.archunit:archunit:0.23.1'
 ```
 
 ###### Maven
@@ -26,7 +26,7 @@ testImplementation 'com.tngtech.archunit:archunit:0.22.0'
 <dependency>
     <groupId>com.tngtech.archunit</groupId>
     <artifactId>archunit</artifactId>
-    <version>0.22.0</version>
+    <version>0.23.1</version>
     <scope>test</scope>
 </dependency>
 ```
diff --git a/archunit/build.gradle b/archunit/build.gradle
index 44370c6845..4754ef02b0 100644
--- a/archunit/build.gradle
+++ b/archunit/build.gradle
@@ -88,7 +88,8 @@ dependencies {
     runtimeOnly sourceSets.jdk9main.output
 }
 
-compileJdk9mainJava.with {
+compileJdk9mainJava {
+    dependsOn(compileJava)
     ext.minimumJavaVersion = JavaVersion.VERSION_1_9
 
     destinationDir = compileJava.destinationDir
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnit.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnit.java
index 3cde461bab..e654e44e4f 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnit.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaCodeUnit.java
@@ -55,7 +55,7 @@ public abstract class JavaCodeUnit
         extends JavaMember
         implements HasParameterTypes, HasReturnType, HasTypeParameters<JavaCodeUnit>, HasThrowsClause<JavaCodeUnit> {
 
-    private final JavaType returnType;
+    private final ReturnType returnType;
     private final Parameters parameters;
     private final String fullName;
     private final List<JavaTypeVariable<JavaCodeUnit>> typeParameters;
@@ -71,7 +71,7 @@ public abstract class JavaCodeUnit
     JavaCodeUnit(JavaCodeUnitBuilder<?, ?> builder) {
         super(builder);
         typeParameters = builder.getTypeParameters(this);
-        returnType = builder.getReturnType(this);
+        returnType = new ReturnType(this, builder);
         parameters = new Parameters(this, builder);
         fullName = formatMethod(getOwner().getName(), getName(), namesOf(getRawParameterTypes()));
         referencedClassObjects = ImmutableSet.copyOf(builder.getReferencedClassObjects(this));
@@ -157,13 +157,13 @@ public List<JavaClass> getExceptionTypes() {
     @Override
     @PublicAPI(usage = ACCESS)
     public JavaType getReturnType() {
-        return returnType;
+        return returnType.get();
     }
 
     @Override
     @PublicAPI(usage = ACCESS)
     public JavaClass getRawReturnType() {
-        return returnType.toErasure();
+        return returnType.getRaw();
     }
 
     @PublicAPI(usage = ACCESS)
@@ -323,6 +323,24 @@ protected List<JavaParameter> delegate() {
         }
     }
 
+    private static class ReturnType {
+        private final JavaClass rawReturnType;
+        private final JavaType returnType;
+
+        ReturnType(JavaCodeUnit owner, JavaCodeUnitBuilder<?, ?> builder) {
+            rawReturnType = builder.getRawReturnType();
+            returnType = builder.getGenericReturnType(owner);
+        }
+
+        JavaClass getRaw() {
+            return rawReturnType;
+        }
+
+        JavaType get() {
+            return returnType;
+        }
+    }
+
     public static final class Predicates {
         private Predicates() {
         }
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/DependencyResolutionProcess.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/DependencyResolutionProcess.java
index d032c3c42c..c8adafe049 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/importer/DependencyResolutionProcess.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/DependencyResolutionProcess.java
@@ -124,7 +124,7 @@ void resolve(ImportedClasses classes) {
     }
 
     private void logConfiguration() {
-        log.info("Automatically resolving transitive class dependencies with the following configuration:{}{}{}{}{}{}",
+        log.debug("Automatically resolving transitive class dependencies with the following configuration:{}{}{}{}{}{}",
                 formatConfigProperty(MAX_ITERATIONS_FOR_MEMBER_TYPES_PROPERTY_NAME, maxRunsForMemberTypes),
                 formatConfigProperty(MAX_ITERATIONS_FOR_ACCESSES_TO_TYPES_PROPERTY_NAME, maxRunsForAccessesToTypes),
                 formatConfigProperty(MAX_ITERATIONS_FOR_SUPERTYPES_PROPERTY_NAME, maxRunsForSupertypes),
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java
index fabd004a71..d3bb39e92a 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java
@@ -305,10 +305,14 @@ boolean hasNoParameters() {
             return rawParameterTypes.isEmpty();
         }
 
-        public JavaType getReturnType(JavaCodeUnit codeUnit) {
+        public JavaClass getRawReturnType() {
+            return get(rawReturnType.getFullyQualifiedClassName());
+        }
+
+        public JavaType getGenericReturnType(JavaCodeUnit codeUnit) {
             return genericReturnType.isPresent()
                     ? genericReturnType.get().finish(codeUnit, allTypeParametersInContextOf(codeUnit), importedClasses)
-                    : get(rawReturnType.getFullyQualifiedClassName());
+                    : getRawReturnType();
         }
 
         private Iterable<JavaTypeVariable<?>> allTypeParametersInContextOf(JavaCodeUnit codeUnit) {
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java
index c4c3ab7e92..4e1f6bbc6d 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/RawAccessRecord.java
@@ -22,7 +22,6 @@
 import com.tngtech.archunit.core.domain.JavaClassDescriptor;
 import com.tngtech.archunit.core.domain.JavaCodeUnit;
 import com.tngtech.archunit.core.domain.JavaFieldAccess.AccessType;
-import com.tngtech.archunit.core.domain.properties.HasName;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -139,8 +138,7 @@ public String toString() {
 
         public boolean is(JavaCodeUnit method) {
             return getName().equals(method.getName())
-                    && getRawParameterTypeNames().equals(HasName.Utils.namesOf(method.getRawParameterTypes()))
-                    && returnType.getFullyQualifiedClassName().equals(method.getRawReturnType().getName())
+                    && descriptor.equals(method.getDescriptor())
                     && getDeclaringClassName().equals(method.getOwner().getName());
         }
     }
diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/AllowEmptyShould.java b/archunit/src/main/java/com/tngtech/archunit/lang/AllowEmptyShould.java
new file mode 100644
index 0000000000..e523d4e52b
--- /dev/null
+++ b/archunit/src/main/java/com/tngtech/archunit/lang/AllowEmptyShould.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014-2022 TNG Technology Consulting GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.tngtech.archunit.lang;
+
+import com.tngtech.archunit.ArchConfiguration;
+
+enum AllowEmptyShould {
+    TRUE {
+        @Override
+        public boolean isAllowed() {
+            return true;
+        }
+    },
+    FALSE {
+        @Override
+        public boolean isAllowed() {
+            return false;
+        }
+    },
+    AS_CONFIGURED {
+        @Override
+        public boolean isAllowed() {
+            return ArchConfiguration.get().getPropertyOrDefault(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME, TRUE.toString())
+                    .equalsIgnoreCase(FALSE.toString());
+        }
+    };
+
+    private static final String FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME = "archRule.failOnEmptyShould";
+
+    abstract boolean isAllowed();
+
+    static AllowEmptyShould fromBoolean(boolean allow) {
+        return allow ? TRUE : FALSE;
+    }
+}
diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java b/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java
index 849bf60018..ade2990131 100644
--- a/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java
+++ b/archunit/src/main/java/com/tngtech/archunit/lang/ArchRule.java
@@ -23,7 +23,6 @@
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
-import com.tngtech.archunit.ArchConfiguration;
 import com.tngtech.archunit.Internal;
 import com.tngtech.archunit.PublicAPI;
 import com.tngtech.archunit.base.Optional;
@@ -41,7 +40,6 @@
 import static com.google.common.io.Resources.readLines;
 import static com.tngtech.archunit.PublicAPI.Usage.ACCESS;
 import static com.tngtech.archunit.base.ClassLoaders.getCurrentClassLoader;
-import static java.lang.Boolean.TRUE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 /**
@@ -68,6 +66,18 @@ public interface ArchRule extends CanBeEvaluated, CanOverrideDescription<ArchRul
     @PublicAPI(usage = ACCESS)
     ArchRule because(String reason);
 
+    /**
+     * If set to {@code true} allows the should-clause of this rule to be checked against an empty set of elements.
+     * Otherwise, the rule will fail with a respective message. This is to prevent possible implementation errors,
+     * like filtering for a non-existing package in the that-clause causing an always-passing rule.<br>
+     * Note that this method will override the configuration property {@code archRule.failOnEmptyShould}.
+     *
+     * @param allowEmptyShould Whether the rule fails if the should-clause is evaluated with an empty set of elements
+     * @return A (new) {@link ArchRule} with adjusted {@code allowEmptyShould} behavior
+     */
+    @PublicAPI(usage = ACCESS)
+    ArchRule allowEmptyShould(boolean allowEmptyShould);
+
     @PublicAPI(usage = ACCESS)
     final class Assertions {
         private static final ArchUnitExtensions extensions = new ArchUnitExtensions();
@@ -166,7 +176,7 @@ public EvaluationResult getResult() {
     @Internal
     class Factory {
         public static <T> ArchRule create(final ClassesTransformer<T> classesTransformer, final ArchCondition<T> condition, final Priority priority) {
-            return new SimpleArchRule<>(priority, classesTransformer, condition, Optional.<String>empty());
+            return new SimpleArchRule<>(priority, classesTransformer, condition, Optional.<String>empty(), AllowEmptyShould.AS_CONFIGURED);
         }
 
         public static ArchRule withBecause(ArchRule rule, String reason) {
@@ -184,18 +194,20 @@ private static class SimpleArchRule<T> implements ArchRule {
             private final ClassesTransformer<T> classesTransformer;
             private final ArchCondition<T> condition;
             private final Optional<String> overriddenDescription;
+            private final AllowEmptyShould allowEmptyShould;
 
             private SimpleArchRule(Priority priority, ClassesTransformer<T> classesTransformer, ArchCondition<T> condition,
-                    Optional<String> overriddenDescription) {
+                    Optional<String> overriddenDescription, AllowEmptyShould allowEmptyShould) {
                 this.priority = priority;
                 this.classesTransformer = classesTransformer;
                 this.condition = condition;
                 this.overriddenDescription = overriddenDescription;
+                this.allowEmptyShould = allowEmptyShould;
             }
 
             @Override
             public ArchRule as(String newDescription) {
-                return new SimpleArchRule<>(priority, classesTransformer, condition, Optional.of(newDescription));
+                return new SimpleArchRule<>(priority, classesTransformer, condition, Optional.of(newDescription), allowEmptyShould);
             }
 
             @Override
@@ -208,6 +220,11 @@ public ArchRule because(String reason) {
                 return withBecause(this, reason);
             }
 
+            @Override
+            public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+                return new SimpleArchRule<>(priority, classesTransformer, condition, overriddenDescription, AllowEmptyShould.fromBoolean(allowEmptyShould));
+            }
+
             @Override
             public EvaluationResult evaluate(JavaClasses classes) {
                 Iterable<T> allObjects = classesTransformer.transform(classes);
@@ -223,20 +240,18 @@ public EvaluationResult evaluate(JavaClasses classes) {
             }
 
             private void verifyNoEmptyShouldIfEnabled(Iterable<T> allObjects) {
-                if (isEmpty(allObjects) && isFailOnEmptyShouldEnabled()) {
-                    throw new AssertionError("Rule failed to check any classes. " +
-                            "This means either that no classes have been passed to the rule at all, " +
-                            "or that no classes passed to the rule matched the `that()` clause. " +
-                            "To allow rules being evaluated without checking any classes you can set the ArchUnit property " +
-                            FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME + " = " + false);
+                if (isEmpty(allObjects) && !allowEmptyShould.isAllowed()) {
+                    throw new AssertionError(String.format(
+                            "Rule '%s' failed to check any classes. "
+                                    + "This means either that no classes have been passed to the rule at all, "
+                                    + "or that no classes passed to the rule matched the `that()` clause. "
+                                    + "To allow rules being evaluated without checking any classes you can either "
+                                    + "use `%s.allowEmptyShould(true)` on a single rule or set the configuration property `%s = false` "
+                                    + "to change the behavior globally.",
+                            getDescription(), ArchRule.class.getSimpleName(), FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME));
                 }
             }
 
-            private boolean isFailOnEmptyShouldEnabled() {
-                return ArchConfiguration.get().getPropertyOrDefault(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME, TRUE.toString())
-                        .equals(TRUE.toString());
-            }
-
             @Override
             public String getDescription() {
                 return overriddenDescription.isPresent() ?
diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/CompositeArchRule.java b/archunit/src/main/java/com/tngtech/archunit/lang/CompositeArchRule.java
index 5a48a15e41..56395b26cc 100644
--- a/archunit/src/main/java/com/tngtech/archunit/lang/CompositeArchRule.java
+++ b/archunit/src/main/java/com/tngtech/archunit/lang/CompositeArchRule.java
@@ -82,6 +82,16 @@ public CompositeArchRule because(String reason) {
         return new CompositeArchRule(priority, rules, createBecauseDescription(this, reason));
     }
 
+    @Override
+    @PublicAPI(usage = ACCESS)
+    public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+        ImmutableList.Builder<ArchRule> rulesWithOverriddenAllowEmptyShould = ImmutableList.builder();
+        for (ArchRule rule : rules) {
+            rulesWithOverriddenAllowEmptyShould.add(rule.allowEmptyShould(allowEmptyShould));
+        }
+        return new CompositeArchRule(priority, rulesWithOverriddenAllowEmptyShould.build(), description);
+    }
+
     @Override
     @PublicAPI(usage = ACCESS)
     public EvaluationResult evaluate(JavaClasses classes) {
diff --git a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java
index f449c04296..57fb96df98 100644
--- a/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java
+++ b/archunit/src/main/java/com/tngtech/archunit/lang/syntax/ObjectsShouldInternal.java
@@ -86,6 +86,11 @@ public ArchRule because(String reason) {
         return ArchRule.Factory.withBecause(this, reason);
     }
 
+    @Override
+    public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+        return finishedRule.get().allowEmptyShould(allowEmptyShould);
+    }
+
     @Override
     public ArchRule as(String newDescription) {
         return finishedRule.get().as(newDescription);
diff --git a/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java b/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java
index 3bfbf6ceb2..d430efb02a 100644
--- a/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java
+++ b/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java
@@ -109,7 +109,7 @@ public static final class LayeredArchitecture implements ArchRule {
         private final Set<LayerDependencySpecification> dependencySpecifications;
         private final PredicateAggregator<Dependency> irrelevantDependenciesPredicate;
         private final Optional<String> overriddenDescription;
-        private boolean optionalLayers;
+        private final boolean optionalLayers;
 
         private LayeredArchitecture() {
             this(new LayerDefinitions(),
@@ -140,8 +140,7 @@ private LayeredArchitecture(LayerDefinitions layerDefinitions,
          */
         @PublicAPI(usage = ACCESS)
         public LayeredArchitecture withOptionalLayers(boolean optionalLayers) {
-            this.optionalLayers = optionalLayers;
-            return this;
+            return new LayeredArchitecture(layerDefinitions, dependencySpecifications, irrelevantDependenciesPredicate, overriddenDescription, optionalLayers);
         }
 
         private LayeredArchitecture addLayerDefinition(LayerDefinition definition) {
@@ -223,6 +222,8 @@ private void checkEmptyLayers(JavaClasses classes, EvaluationResult result) {
         private EvaluationResult evaluateLayersShouldNotBeEmpty(JavaClasses classes, LayerDefinition layerDefinition) {
             return classes().that(layerDefinitions.containsPredicateFor(layerDefinition.name))
                     .should(notBeEmptyFor(layerDefinition))
+                    // we need to set `allowEmptyShould(true)` to allow the layer not empty check to be evaluated. This will provide a nicer error message.
+                    .allowEmptyShould(true)
                     .evaluate(classes);
         }
 
@@ -232,6 +233,7 @@ private EvaluationResult evaluateDependenciesShouldBeSatisfied(JavaClasses class
                     : onlyHaveDependenciesWhere(targetMatchesIfDependencyIsRelevant(specification.layerName, specification.allowedLayers));
             return classes().that(layerDefinitions.containsPredicateFor(specification.layerName))
                     .should(satisfyLayerDependenciesCondition)
+                    .allowEmptyShould(true)
                     .evaluate(classes);
         }
 
@@ -257,32 +259,6 @@ private DescribedPredicate<Dependency> ifDependencyIsRelevant(DescribedPredicate
                     originPackageMatches;
         }
 
-        private static ArchCondition<JavaClass> notBeEmptyFor(final LayeredArchitecture.LayerDefinition layerDefinition) {
-            return new LayerShouldNotBeEmptyCondition(layerDefinition);
-        }
-
-        private static class LayerShouldNotBeEmptyCondition extends ArchCondition<JavaClass> {
-            private final LayeredArchitecture.LayerDefinition layerDefinition;
-            private boolean empty = true;
-
-            LayerShouldNotBeEmptyCondition(final LayeredArchitecture.LayerDefinition layerDefinition) {
-                super("not be empty");
-                this.layerDefinition = layerDefinition;
-            }
-
-            @Override
-            public void check(JavaClass item, ConditionEvents events) {
-                empty = false;
-            }
-
-            @Override
-            public void finish(ConditionEvents events) {
-                if (empty) {
-                    events.add(violated(layerDefinition, String.format("Layer '%s' is empty", layerDefinition.name)));
-                }
-            }
-        }
-
         @Override
         @PublicAPI(usage = ACCESS)
         public void check(JavaClasses classes) {
@@ -295,6 +271,15 @@ public ArchRule because(String reason) {
             return ArchRule.Factory.withBecause(this, reason);
         }
 
+        /**
+         * This method is equivalent to calling {@link #withOptionalLayers(boolean)}, which should be preferred in this context
+         * as the meaning is easier to understand.
+         */
+        @Override
+        public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+            return withOptionalLayers(allowEmptyShould);
+        }
+
         @Override
         @PublicAPI(usage = ACCESS)
         public LayeredArchitecture as(String newDescription) {
@@ -353,6 +338,32 @@ private void checkLayerNamesExist(String... layerNames) {
             }
         }
 
+        private static ArchCondition<JavaClass> notBeEmptyFor(final LayeredArchitecture.LayerDefinition layerDefinition) {
+            return new LayerShouldNotBeEmptyCondition(layerDefinition);
+        }
+
+        private static class LayerShouldNotBeEmptyCondition extends ArchCondition<JavaClass> {
+            private final LayeredArchitecture.LayerDefinition layerDefinition;
+            private boolean empty = true;
+
+            LayerShouldNotBeEmptyCondition(final LayeredArchitecture.LayerDefinition layerDefinition) {
+                super("not be empty");
+                this.layerDefinition = layerDefinition;
+            }
+
+            @Override
+            public void check(JavaClass item, ConditionEvents events) {
+                empty = false;
+            }
+
+            @Override
+            public void finish(ConditionEvents events) {
+                if (empty) {
+                    events.add(violated(layerDefinition, String.format("Layer '%s' is empty", layerDefinition.name)));
+                }
+            }
+        }
+
         private static final class LayerDefinitions implements Iterable<LayerDefinition> {
             private final Map<String, LayerDefinition> layerDefinitions = new LinkedHashMap<>();
 
@@ -571,6 +582,10 @@ public OnionArchitecture adapter(String name, String... packageIdentifiers) {
             return this;
         }
 
+        /**
+         * @param optionalLayers Whether the different parts of the Onion Architecture (domain models, domain services, ...) should be allowed to be empty.
+         *                       If set to {@code false} the {@link OnionArchitecture OnionArchitecture} will fail if any such layer does not contain any class.
+         */
         @PublicAPI(usage = ACCESS)
         public OnionArchitecture withOptionalLayers(boolean optionalLayers) {
             this.optionalLayers = optionalLayers;
@@ -638,6 +653,15 @@ public ArchRule because(String reason) {
             return ArchRule.Factory.withBecause(this, reason);
         }
 
+        /**
+         * This method is equivalent to calling {@link #withOptionalLayers(boolean)}, which should be preferred in this context
+         * as the meaning is easier to understand.
+         */
+        @Override
+        public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+            return withOptionalLayers(allowEmptyShould);
+        }
+
         @Override
         public OnionArchitecture as(String newDescription) {
             return new OnionArchitecture(domainModelPackageIdentifiers, domainServicePackageIdentifiers,
diff --git a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceRule.java b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceRule.java
index 91f5c714f7..d35a55351f 100644
--- a/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceRule.java
+++ b/archunit/src/main/java/com/tngtech/archunit/library/dependencies/SliceRule.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.tngtech.archunit.PublicAPI;
 import com.tngtech.archunit.base.DescribedPredicate;
+import com.tngtech.archunit.base.Optional;
 import com.tngtech.archunit.core.domain.Dependency;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaClasses;
@@ -44,18 +45,32 @@ public final class SliceRule implements ArchRule {
     private final List<Transformation> transformations;
     private final DescribedPredicate<Dependency> ignoreDependency;
     private final ConditionFactory conditionFactory;
+    private final Optional<Boolean> allowEmptyShould;
 
     SliceRule(Slices.Transformer inputTransformer, Priority priority, ConditionFactory conditionFactory) {
-        this(inputTransformer, priority, Collections.<Transformation>emptyList(), DescribedPredicate.<Dependency>alwaysFalse(), conditionFactory);
+        this(
+                inputTransformer,
+                priority,
+                Collections.<Transformation>emptyList(),
+                DescribedPredicate.<Dependency>alwaysFalse(),
+                conditionFactory,
+                Optional.<Boolean>empty());
     }
 
-    private SliceRule(Slices.Transformer inputTransformer, Priority priority, List<Transformation> transformations,
-            DescribedPredicate<Dependency> ignoreDependency, ConditionFactory conditionFactory) {
+    private SliceRule(
+            Slices.Transformer inputTransformer,
+            Priority priority,
+            List<Transformation> transformations,
+            DescribedPredicate<Dependency> ignoreDependency,
+            ConditionFactory conditionFactory,
+            Optional<Boolean> allowEmptyShould
+    ) {
         this.inputTransformer = inputTransformer;
         this.priority = priority;
         this.transformations = transformations;
         this.ignoreDependency = ignoreDependency;
         this.conditionFactory = conditionFactory;
+        this.allowEmptyShould = allowEmptyShould;
     }
 
     @Override
@@ -70,6 +85,12 @@ public SliceRule because(String reason) {
         return copyWithTransformation(new Because(reason));
     }
 
+    @Override
+    @PublicAPI(usage = ACCESS)
+    public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+        return new SliceRule(inputTransformer, priority, transformations, ignoreDependency, conditionFactory, Optional.of(allowEmptyShould));
+    }
+
     @Override
     @PublicAPI(usage = ACCESS)
     public EvaluationResult evaluate(JavaClasses classes) {
@@ -100,17 +121,22 @@ public SliceRule ignoreDependency(String origin, String target) {
 
     @PublicAPI(usage = ACCESS)
     public SliceRule ignoreDependency(DescribedPredicate<? super JavaClass> origin, DescribedPredicate<? super JavaClass> target) {
-        return new SliceRule(inputTransformer, priority, transformations, ignoreDependency.or(dependency(origin, target)), conditionFactory);
+        return new SliceRule(inputTransformer, priority, transformations, ignoreDependency.or(dependency(origin, target)), conditionFactory, allowEmptyShould);
     }
 
     private SliceRule copyWithTransformation(Transformation transformation) {
         List<Transformation> newTransformations =
                 ImmutableList.<Transformation>builder().addAll(transformations).add(transformation).build();
-        return new SliceRule(inputTransformer, priority, newTransformations, ignoreDependency, conditionFactory);
+        return new SliceRule(inputTransformer, priority, newTransformations, ignoreDependency, conditionFactory, allowEmptyShould);
     }
 
     private ArchRule getArchRule() {
-        ArchRule rule = priority(priority).all(inputTransformer).should(conditionFactory.create(inputTransformer, not(ignoreDependency)));
+        ArchRule rule = priority(priority)
+                .all(inputTransformer)
+                .should(conditionFactory.create(inputTransformer, not(ignoreDependency)));
+        if (allowEmptyShould.isPresent()) {
+            rule = rule.allowEmptyShould(allowEmptyShould.get());
+        }
         for (Transformation transformation : transformations) {
             rule = transformation.apply(rule);
         }
diff --git a/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java b/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java
index 609ba4649f..ad382137fb 100644
--- a/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java
+++ b/archunit/src/main/java/com/tngtech/archunit/library/freeze/FreezingArchRule.java
@@ -102,6 +102,12 @@ public FreezingArchRule because(String reason) {
         return new FreezingArchRule(delegate.because(reason), store, matcher);
     }
 
+    @Override
+    @PublicAPI(usage = ACCESS)
+    public ArchRule allowEmptyShould(boolean allowEmptyShould) {
+        return new FreezingArchRule(delegate.allowEmptyShould(allowEmptyShould), store, matcher);
+    }
+
     @Override
     @PublicAPI(usage = ACCESS)
     public FreezingArchRule as(String newDescription) {
diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java
index 25e99d22cb..c90e2f914c 100644
--- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ClassFileImporterAccessesTest.java
@@ -101,6 +101,8 @@
 import static com.tngtech.archunit.testutil.ReflectionTestUtils.constructor;
 import static com.tngtech.archunit.testutil.ReflectionTestUtils.field;
 import static com.tngtech.archunit.testutil.ReflectionTestUtils.method;
+import static com.tngtech.archunit.testutil.TestUtils.relativeResourceUri;
+import static java.util.Collections.singleton;
 
 @RunWith(DataProviderRunner.class)
 public class ClassFileImporterAccessesTest {
@@ -898,6 +900,30 @@ void call(Target target) {
                 .isEqualTo(call.getTarget().getRawParameterTypes());
     }
 
+    @Test
+    public void identifies_call_origin_if_signature_and_descriptor_deviate() {
+        // Kotlin inline functions cause the creation of extra classes where the signature of the respective method shows
+        // the real types while the descriptor shows the erased types. The erasure of the real types from the signature
+        // does then not match the descriptor in some cases.
+        //
+        // The file `MismatchBetweenDescriptorAndSignature.class` is a byproduct of the following source code:
+        // --------------------
+        // package com.example
+        //
+        // object CrashArchUnit {
+        //     fun useInlineFunctionCrashingArchUnit(strings: List<String>) = strings.groupingBy { it.length }
+        // }
+        // --------------------
+        // With the current Kotlin version this creates a synthetic class file `CrashArchUnit$useInlineFunctionCrashingArchUnit$$inlined$groupingBy$1.class`
+        // which has been copied and renamed to `MismatchBetweenDescriptorAndSignature.class`.
+
+        JavaClass javaClass = getOnlyElement(new ClassFileImporter().importLocations(singleton(Location.of(
+                relativeResourceUri(getClass(), "testexamples/MismatchBetweenDescriptorAndSignature.class")))));
+
+        // this method in the problematic compiled class has a mismatch between return type of descriptor and signature
+        assertThat(javaClass.getMethod("keyOf", Object.class).getMethodCallsFromSelf()).isNotEmpty();
+    }
+
     private Set<Dependency> withoutJavaLangTargets(Set<Dependency> dependencies) {
         Set<Dependency> result = new HashSet<>();
         for (Dependency dependency : dependencies) {
diff --git a/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportOptionsTest.java b/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportOptionsTest.java
index ef6502a212..fc141e6859 100644
--- a/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportOptionsTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/core/importer/ImportOptionsTest.java
@@ -29,6 +29,7 @@
 import static com.tngtech.archunit.core.importer.ImportOption.Predefined.DO_NOT_INCLUDE_PACKAGE_INFOS;
 import static com.tngtech.archunit.core.importer.ImportOption.Predefined.DO_NOT_INCLUDE_TESTS;
 import static com.tngtech.archunit.core.importer.ImportOption.Predefined.ONLY_INCLUDE_TESTS;
+import static com.tngtech.archunit.testutil.TestUtils.relativeResourceUri;
 import static com.tngtech.java.junit.dataprovider.DataProviders.$;
 import static com.tngtech.java.junit.dataprovider.DataProviders.crossProduct;
 import static com.tngtech.java.junit.dataprovider.DataProviders.testForEach;
@@ -168,7 +169,7 @@ public static Object[][] do_not_include_package_info_classes() {
     @Test
     @UseDataProvider("do_not_include_package_info_classes")
     public void detect_package_info_class(ImportOption doNotIncludePackageInfoClasses) throws URISyntaxException {
-        Location packageInfoLocation = Location.of(getClass().getResource(testExampleResourcePath("package-info.class")).toURI());
+        Location packageInfoLocation = Location.of(relativeResourceUri(getClass(), "testexamples/package-info.class"));
         assertThat(doNotIncludePackageInfoClasses.includes(packageInfoLocation))
                 .as("doNotIncludePackageInfoClasses includes package-info.class")
                 .isFalse();
@@ -179,10 +180,6 @@ public void detect_package_info_class(ImportOption doNotIncludePackageInfoClasse
                 .isTrue();
     }
 
-    private String testExampleResourcePath(String resourceName) {
-        return "/" + getClass().getPackage().getName().replace(".", "/") + "/testexamples/" + resourceName;
-    }
-
     private static Location locationOf(Class<?> clazz) {
         return getLast(Locations.ofClass(clazz));
     }
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java
index 3d5ce88966..05bb37c0f0 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/ArchRuleTest.java
@@ -10,7 +10,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.io.Files;
-import com.tngtech.archunit.ArchConfiguration;
+import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.domain.JavaClassesTest;
@@ -33,13 +33,12 @@
 import static com.tngtech.archunit.lang.Priority.HIGH;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.all;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+import static com.tngtech.archunit.testutil.ArchConfigurationRule.FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME;
 import static com.tngtech.archunit.testutil.TestUtils.toUri;
-import static java.lang.Boolean.FALSE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ArchRuleTest {
-    private static final String FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME = "archRule.failOnEmptyShould";
 
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
@@ -169,32 +168,47 @@ public void finish(ConditionEvents events) {
     }
 
     @Test
-    public void evaluation_fails_because_of_empty_set_of_classes_with_default_fail_on_empty_should() {
-        archConfigurationRule.removeProperty(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME);
-
+    public void evaluation_fails_because_of_empty_set_of_elements_with_default_fail_on_empty_should() {
         thrown.expect(AssertionError.class);
-        thrown.expectMessage("Rule failed to check any classes");
+        thrown.expectMessage("failed to check any classes");
         thrown.expectMessage(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME);
 
-        classes().should(ALWAYS_BE_VALID).evaluate(importClasses());
+        createPassingArchRule().evaluate(importEmptyClasses());
     }
 
     @Test
-    public void evaluation_fails_because_of_empty_set_of_classes_after_filter_with_default_fail_on_empty_should() {
-        archConfigurationRule.removeProperty(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME);
-
+    public void evaluation_fails_because_of_empty_set_of_elements_after_that_clause_with_default_fail_on_empty_should() {
         thrown.expect(AssertionError.class);
-        thrown.expectMessage("Rule failed to check any classes");
+        thrown.expectMessage("failed to check any classes");
         thrown.expectMessage(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME);
 
-        classes().that().doNotHaveSimpleName(SomeClass.class.getSimpleName()).should(ALWAYS_BE_VALID).evaluate(importClasses(SomeClass.class));
+        createPassingArchRule(strings().that(DescribedPredicate.<String>alwaysFalse())).evaluate(importClasses(SomeClass.class));
     }
 
     @Test
-    public void evaluation_passes_on_empty_set_of_classes_with_deactivated_fail_on_empty_should() {
-        ArchConfiguration.get().setProperty(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME, FALSE.toString());
+    public void evaluation_passes_on_empty_set_of_elements_with_deactivated_fail_on_empty_should_by_configuration() {
+        archConfigurationRule.setFailOnEmptyShould(false);
 
-        classes().should(ALWAYS_BE_VALID).evaluate(importClasses());
+        createPassingArchRule().evaluate(importEmptyClasses());
+    }
+
+    @Test
+    public void evaluation_passes_on_empty_set_of_elements_with_activated_fail_on_empty_should_by_configuration_but_overridden_by_rule() {
+        archConfigurationRule.setFailOnEmptyShould(true);
+
+        createPassingArchRule().allowEmptyShould(true).evaluate(importEmptyClasses());
+    }
+
+    private JavaClasses importEmptyClasses() {
+        return importClasses();
+    }
+
+    private ArchRule createPassingArchRule() {
+        return createPassingArchRule(strings());
+    }
+
+    private <T> ArchRule createPassingArchRule(ClassesTransformer<T> classesTransformer) {
+        return ArchRule.Factory.create(classesTransformer, ALWAYS_BE_VALID.<T>forSubtype(), Priority.MEDIUM);
     }
 
     private ClassesTransformer<String> strings() {
@@ -288,10 +302,10 @@ public void check(JavaClass item, ConditionEvents events) {
                 }
             };
 
-    private static final ArchCondition<JavaClass> ALWAYS_BE_VALID =
-            new ArchCondition<JavaClass>("always be valid") {
+    private static final ArchCondition<Object> ALWAYS_BE_VALID =
+            new ArchCondition<Object>("always be valid") {
                 @Override
-                public void check(JavaClass item, ConditionEvents events) {
+                public void check(Object item, ConditionEvents events) {
                 }
             };
 
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java
index 849c08dad5..68ca4d2d94 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/CompositeArchRuleTest.java
@@ -1,16 +1,21 @@
 package com.tngtech.archunit.lang;
 
+import java.util.List;
+
 import com.google.common.collect.ImmutableList;
+import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaClasses;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.List;
-
 import static com.tngtech.archunit.core.domain.TestUtils.importClasses;
 import static com.tngtech.archunit.lang.Priority.HIGH;
 import static com.tngtech.archunit.lang.Priority.MEDIUM;
@@ -18,12 +23,16 @@
 import static com.tngtech.java.junit.dataprovider.DataProviders.$;
 import static com.tngtech.java.junit.dataprovider.DataProviders.$$;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @RunWith(DataProviderRunner.class)
 public class CompositeArchRuleTest {
     private static final boolean SATISFIED = true;
     private static final boolean UNSATISFIED = false;
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule();
+
     @DataProvider
     public static Object[][] rules_to_AND() {
         return $$(
@@ -83,6 +92,37 @@ public void priority_is_passed() {
         assertPriority(failureMessage, priority);
     }
 
+    @Test
+    public void fails_on_empty_should_by_default() {
+        assertThatThrownBy(new ThrowingCallable() {
+            @Override
+            public void call() {
+                compositeRuleWithPartialEmptyShould().check(new ClassFileImporter().importClasses(Object.class));
+            }
+        }).isInstanceOf(AssertionError.class)
+                .hasMessageContaining("failed to check any classes");
+    }
+
+    @Test
+    public void should_allow_empty_should_if_configured() {
+        archConfigurationRule.setFailOnEmptyShould(false);
+
+        compositeRuleWithPartialEmptyShould().check(new ClassFileImporter().importClasses(Object.class));
+    }
+
+    @Test
+    public void allows_empty_should_if_overridden_by_rule() {
+        archConfigurationRule.setFailOnEmptyShould(true);
+
+        compositeRuleWithPartialEmptyShould().allowEmptyShould(true).check(new ClassFileImporter().importClasses(Object.class));
+    }
+
+    private static CompositeArchRule compositeRuleWithPartialEmptyShould() {
+        return CompositeArchRule
+                .of(classes().should().bePublic())
+                .and(classes().that(DescribedPredicate.<JavaClass>alwaysFalse()).should().bePublic());
+    }
+
     private void assertPriority(String failureMessage, Priority priority) {
         assertThat(failureMessage).contains(String.format("[Priority: %s]", priority));
     }
@@ -108,4 +148,4 @@ public void check(JavaClass item, ConditionEvents events) {
             }
         }, Priority.MEDIUM).as(String.format("%s rule", satisfied ? "satisfied" : "failing"));
     }
-}
\ No newline at end of file
+}
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java
index 427e2de7c5..439f564474 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/ClassesShouldTest.java
@@ -19,12 +19,14 @@
 import com.tngtech.archunit.core.domain.JavaAccess;
 import com.tngtech.archunit.core.domain.JavaAnnotation;
 import com.tngtech.archunit.core.domain.JavaCall;
+import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaModifier;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotatedTest;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotatedTest.ClassRetentionAnnotation;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotatedTest.DefaultClassRetentionAnnotation;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotatedTest.RuntimeRetentionAnnotation;
 import com.tngtech.archunit.core.domain.properties.CanBeAnnotatedTest.SourceRetentionAnnotation;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
 import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.EvaluationResult;
@@ -35,6 +37,7 @@
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -72,6 +75,7 @@
 import static com.tngtech.java.junit.dataprovider.DataProviders.$$;
 import static com.tngtech.java.junit.dataprovider.DataProviders.testForEach;
 import static java.util.regex.Pattern.quote;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @RunWith(DataProviderRunner.class)
 public class ClassesShouldTest {
@@ -1767,6 +1771,35 @@ public void onlyCall_should_report_success_if_targets_are_non_resolvable(ArchRul
         assertThatRule(rule).checking(importClasses(classCallingUnresolvableTarget)).hasNoViolation();
     }
 
+    @Test
+    public void should_fail_on_empty_should_by_default() {
+        assertThatThrownBy(new ThrowingCallable() {
+            @Override
+            public void call() {
+                ruleWithEmptyShould().check(new ClassFileImporter().importClasses(getClass()));
+            }
+        }).isInstanceOf(AssertionError.class)
+                .hasMessageContaining("failed to check any classes");
+    }
+
+    @Test
+    public void should_allow_empty_should_if_configured() {
+        configurationRule.setFailOnEmptyShould(false);
+
+        ruleWithEmptyShould().check(new ClassFileImporter().importClasses(getClass()));
+    }
+
+    @Test
+    public void should_allow_empty_should_if_overridden_by_rule() {
+        configurationRule.setFailOnEmptyShould(true);
+
+        ruleWithEmptyShould().allowEmptyShould(true).check(new ClassFileImporter().importClasses(getClass()));
+    }
+
+    private static ArchRule ruleWithEmptyShould() {
+        return classes().that(DescribedPredicate.<JavaClass>alwaysFalse()).should().bePublic();
+    }
+
     static String locationPattern(Class<?> clazz) {
         return String.format("\\(%s.java:\\d+\\)", quote(clazz.getSimpleName()));
     }
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java
index 68891ccd5e..93536e8584 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenClassesThatTest.java
@@ -26,6 +26,7 @@
 import com.tngtech.archunit.core.domain.properties.HasType;
 import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ConditionEvents;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import org.junit.Rule;
 import org.junit.Test;
@@ -56,6 +57,9 @@ public class GivenClassesThatTest {
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule();
+
     @Test
     public void haveFullyQualifiedName() {
         List<JavaClass> classes = filterResultOf(classes().that().haveFullyQualifiedName(List.class.getName()))
@@ -474,6 +478,8 @@ public void implement_type() {
 
         assertThatType(getOnlyElement(classes)).matches(ArrayList.class);
 
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         classes = filterResultOf(classes().that().implement(Set.class))
                 .on(ArrayList.class, List.class, Iterable.class);
 
@@ -511,6 +517,8 @@ public void implement_typeName() {
 
         assertThatType(getOnlyElement(classes)).matches(ArrayList.class);
 
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         classes = filterResultOf(classes().that().implement(AbstractList.class.getName()))
                 .on(ArrayList.class, List.class, Iterable.class);
 
@@ -532,6 +540,8 @@ public void implement_predicate() {
 
         assertThatType(getOnlyElement(classes)).matches(ArrayList.class);
 
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         classes = filterResultOf(classes().that().implement(classWithNameOf(AbstractList.class)))
                 .on(ArrayList.class, List.class, Iterable.class);
 
@@ -890,6 +900,8 @@ public void or_conjunction() {
      */
     @Test
     public void conjunctions_aggregate_in_sequence_without_special_precedence() {
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         List<JavaClass> classes = filterResultOf(
                 // (List OR String) AND Collection => empty
                 classes().that().haveSimpleName(List.class.getSimpleName())
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java
index f56c8bee38..73d83e14a7 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenCodeUnitsTest.java
@@ -17,9 +17,11 @@
 import com.tngtech.archunit.lang.EvaluationResult;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
 import com.tngtech.archunit.lang.syntax.elements.GivenMembersTest.DescribedRuleStart;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -45,6 +47,9 @@
 @RunWith(DataProviderRunner.class)
 public class GivenCodeUnitsTest {
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule();
+
     @Test
     public void complex_code_unit_syntax() {
         EvaluationResult result = codeUnits()
@@ -209,6 +214,8 @@ public static Object[][] restricted_return_type_rule_starts() {
     @Test
     @UseDataProvider("restricted_return_type_rule_starts")
     public void return_type_predicates(DescribedRuleStart ruleStart, Collection<String> expectedMembers) {
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         EvaluationResult result = ruleStart.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class));
 
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersDeclaredInClassesThatTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersDeclaredInClassesThatTest.java
index 4147e7ec2d..1fc413a4e2 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersDeclaredInClassesThatTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersDeclaredInClassesThatTest.java
@@ -23,6 +23,7 @@
 import com.tngtech.archunit.core.domain.properties.HasName;
 import com.tngtech.archunit.core.domain.properties.HasType;
 import com.tngtech.archunit.lang.syntax.elements.GivenClassesThatTest.Evaluator;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import org.junit.Rule;
 import org.junit.Test;
@@ -51,6 +52,9 @@ public class GivenMembersDeclaredInClassesThatTest {
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule();
+
     @Test
     public void haveFullyQualifiedName() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().haveFullyQualifiedName(List.class.getName()))
@@ -420,7 +424,7 @@ public void areMetaAnnotatedWith_type() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areMetaAnnotatedWith(SomeAnnotation.class))
                 .on(MetaAnnotatedClass.class, AnnotatedClass.class, SimpleClass.class, MetaAnnotatedAnnotation.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(MetaAnnotatedClass.class, AnnotatedClass.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(MetaAnnotatedClass.class, AnnotatedClass.class, MetaAnnotatedAnnotation.class);
     }
 
     @Test
@@ -428,7 +432,7 @@ public void areNotMetaAnnotatedWith_type() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotMetaAnnotatedWith(SomeAnnotation.class))
                 .on(MetaAnnotatedClass.class, AnnotatedClass.class, SimpleClass.class, MetaAnnotatedAnnotation.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(SimpleClass.class, MetaAnnotatedAnnotation.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(SimpleClass.class);
     }
 
     @Test
@@ -436,7 +440,7 @@ public void areMetaAnnotatedWith_typeName() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areMetaAnnotatedWith(SomeAnnotation.class.getName()))
                 .on(MetaAnnotatedClass.class, AnnotatedClass.class, SimpleClass.class, MetaAnnotatedAnnotation.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(MetaAnnotatedClass.class, AnnotatedClass.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(MetaAnnotatedClass.class, AnnotatedClass.class, MetaAnnotatedAnnotation.class);
     }
 
     @Test
@@ -444,7 +448,7 @@ public void areNotMetaAnnotatedWith_typeName() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotMetaAnnotatedWith(SomeAnnotation.class.getName()))
                 .on(MetaAnnotatedClass.class, AnnotatedClass.class, SimpleClass.class, MetaAnnotatedAnnotation.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(SimpleClass.class, MetaAnnotatedAnnotation.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(SimpleClass.class);
     }
 
     @Test
@@ -453,7 +457,7 @@ public void areMetaAnnotatedWith_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areMetaAnnotatedWith(hasNamePredicate))
                 .on(MetaAnnotatedClass.class, AnnotatedClass.class, SimpleClass.class, MetaAnnotatedAnnotation.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(MetaAnnotatedClass.class, AnnotatedClass.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(MetaAnnotatedClass.class, AnnotatedClass.class, MetaAnnotatedAnnotation.class);
     }
 
     @Test
@@ -462,7 +466,7 @@ public void areNotMetaAnnotatedWith_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotMetaAnnotatedWith(hasNamePredicate))
                 .on(MetaAnnotatedClass.class, AnnotatedClass.class, SimpleClass.class, MetaAnnotatedAnnotation.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(SimpleClass.class, MetaAnnotatedAnnotation.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(SimpleClass.class);
     }
 
     @Test
@@ -472,6 +476,8 @@ public void implement_type() {
 
         assertThatMembers(members).matchInAnyOrderMembersOf(ArrayList.class);
 
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         members = filterResultOf(members().that().areDeclaredInClassesThat().implement(Set.class))
                 .on(ArrayList.class, List.class, Iterable.class);
 
@@ -509,6 +515,8 @@ public void implement_typeName() {
 
         assertThatMembers(members).matchInAnyOrderMembersOf(ArrayList.class);
 
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         members = filterResultOf(members().that().areDeclaredInClassesThat().implement(AbstractList.class.getName()))
                 .on(ArrayList.class, List.class, Iterable.class);
 
@@ -530,6 +538,8 @@ public void implement_predicate() {
 
         assertThatMembers(members).matchInAnyOrderMembersOf(ArrayList.class);
 
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         members = filterResultOf(members().that().areDeclaredInClassesThat().implement(classWithNameOf(AbstractList.class)))
                 .on(ArrayList.class, List.class, Iterable.class);
 
@@ -690,15 +700,15 @@ public void areNotEnums_predicate() {
     @Test
     public void areAnnotations_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areAnnotations())
-                .on(Deprecated.class, Collection.class, SafeVarargs.class, Integer.class);
+                .on(SomeAnnotation.class, Collection.class, MetaAnnotatedAnnotation.class, Integer.class);
 
-        assertThatMembers(members).matchInAnyOrderMembersOf(Deprecated.class, SafeVarargs.class);
+        assertThatMembers(members).matchInAnyOrderMembersOf(SomeAnnotation.class, MetaAnnotatedAnnotation.class);
     }
 
     @Test
     public void areNotAnnotations_predicate() {
         List<JavaMember> members = filterResultOf(members().that().areDeclaredInClassesThat().areNotAnnotations())
-                .on(Deprecated.class, Collection.class, SafeVarargs.class, Integer.class);
+                .on(SomeAnnotation.class, Collection.class, MetaAnnotatedAnnotation.class, Integer.class);
 
         assertThatMembers(members).matchInAnyOrderMembersOf(Collection.class, Integer.class);
     }
@@ -899,6 +909,8 @@ public void or_conjunction() {
      */
     @Test
     public void conjunctions_aggregate_in_sequence_without_special_precedence() {
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         List<JavaMember> members = filterResultOf(
                 // (List OR String) AND Collection => empty
                 members().that().areDeclaredInClassesThat().haveSimpleName(List.class.getSimpleName())
@@ -929,11 +941,13 @@ static Evaluator<JavaMember> filterResultOf(GivenMembersConjunction<JavaMember>
 
     @Retention(RetentionPolicy.RUNTIME)
     private @interface SomeAnnotation {
+        String value() default "default";
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @SomeAnnotation
     private @interface MetaAnnotatedAnnotation {
+        Class<?> value() default Object.class;
     }
 
     private static class SimpleClass {
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java
index d7408a9b81..d1097f8fbc 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/GivenMembersTest.java
@@ -20,9 +20,11 @@
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.EvaluationResult;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -58,6 +60,9 @@
 @RunWith(DataProviderRunner.class)
 public class GivenMembersTest {
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule();
+
     @DataProvider
     public static Object[][] member_syntax_testcases() {
         return $$(
@@ -431,6 +436,8 @@ private static Object[][] annotatedWithDataPoints(
     @Test
     @UseDataProvider("restricted_property_rule_starts")
     public void property_predicates(DescribedRuleStart conjunction, Set<String> expectedMessages) {
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         EvaluationResult result = conjunction.should(everythingViolationPrintMemberName())
                 .evaluate(importClasses(ClassWithVariousMembers.class, A.class, B.class, C.class, MetaAnnotation.class));
 
@@ -676,7 +683,7 @@ static Set<String> allConstructorsExcept(String constructorDescription) {
     static final Set<String> ALL_MEMBER_DESCRIPTIONS =
             union(ALL_CODE_UNIT_DESCRIPTIONS, ALL_FIELD_DESCRIPTIONS);
 
-    @SuppressWarnings({"unused"})
+    @SuppressWarnings({"unused", "FieldCanBeLocal"})
     static class ClassWithVariousMembers {
         @A
         private String fieldA;
diff --git a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/MembersShouldTest.java b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/MembersShouldTest.java
index 14d7bf08f2..52a32fbaac 100644
--- a/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/MembersShouldTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/lang/syntax/elements/MembersShouldTest.java
@@ -10,6 +10,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.base.Function;
+import com.tngtech.archunit.core.domain.JavaMember;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.EvaluationResult;
 import com.tngtech.archunit.lang.conditions.ArchConditions;
@@ -20,9 +22,12 @@
 import com.tngtech.archunit.lang.syntax.elements.GivenMembersTest.MetaAnnotation;
 import com.tngtech.archunit.lang.syntax.elements.GivenMembersTest.OtherClassWithMembers;
 import com.tngtech.archunit.lang.syntax.elements.testclasses.SimpleFieldAndMethod;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.assertj.core.api.ThrowableAssert;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -88,10 +93,14 @@
 import static java.util.Collections.emptySet;
 import static java.util.regex.Pattern.quote;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @RunWith(DataProviderRunner.class)
 public class MembersShouldTest {
 
+    @Rule
+    public final ArchConfigurationRule configurationRule = new ArchConfigurationRule();
+
     @Test
     public void complex_members_syntax() {
         EvaluationResult result = members()
@@ -672,6 +681,35 @@ public void containNumberOfElements_fails_on_mismatching_predicate() {
                         + "com.tngtech.archunit.lang.syntax.elements.testclasses.SimpleFieldAndMethod.violated()]");
     }
 
+    @Test
+    public void should_fail_on_empty_should_by_default() {
+        assertThatThrownBy(new ThrowableAssert.ThrowingCallable() {
+            @Override
+            public void call() {
+                ruleWithEmptyShould().check(new ClassFileImporter().importClasses(getClass()));
+            }
+        }).isInstanceOf(AssertionError.class)
+                .hasMessageContaining("failed to check any classes");
+    }
+
+    @Test
+    public void should_allow_empty_should_if_configured() {
+        configurationRule.setFailOnEmptyShould(false);
+
+        ruleWithEmptyShould().check(new ClassFileImporter().importClasses(getClass()));
+    }
+
+    @Test
+    public void should_allow_empty_should_if_overridden_by_rule() {
+        configurationRule.setFailOnEmptyShould(true);
+
+        ruleWithEmptyShould().allowEmptyShould(true).check(new ClassFileImporter().importClasses(getClass()));
+    }
+
+    private static ArchRule ruleWithEmptyShould() {
+        return members().that(DescribedPredicate.<JavaMember>alwaysFalse()).should().bePublic();
+    }
+
     private Set<String> parseMembers(List<String> details) {
         return parseMembers(ImmutableList.of(ClassWithVariousMembers.class, OtherClassWithMembers.class), details);
     }
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/ArchitecturesTest.java b/archunit/src/test/java/com/tngtech/archunit/library/ArchitecturesTest.java
index 23cd7e541a..95328100bc 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/ArchitecturesTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/ArchitecturesTest.java
@@ -47,6 +47,7 @@
 import static com.tngtech.archunit.core.domain.properties.HasName.Predicates.name;
 import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
 import static com.tngtech.archunit.library.Architectures.onionArchitecture;
+import static com.tngtech.archunit.testutil.Assertions.assertThatRule;
 import static com.tngtech.java.junit.dataprovider.DataProviders.testForEach;
 import static java.beans.Introspector.decapitalize;
 import static java.lang.System.lineSeparator;
@@ -158,9 +159,7 @@ public void layered_architecture_allows_empty_layers_if_all_layers_are_optional(
 
         JavaClasses classes = new ClassFileImporter().importPackages(absolute(""));
 
-        EvaluationResult result = architecture.evaluate(classes);
-        assertThat(result.hasViolation()).as("result of evaluating empty layers has violation").isFalse();
-        assertThat(result.getFailureReport().isEmpty()).as("failure report").isTrue();
+        assertThatRule(architecture).checking(classes).hasNoViolation();
     }
 
     @Test
@@ -177,7 +176,8 @@ private LayeredArchitecture aLayeredArchitectureWithEmptyLayers() {
         return layeredArchitecture()
                 .layer("Some").definedBy(absolute("should.not.be.found.."))
                 .layer("Other").definedBy(absolute("also.not.found"))
-                .layer("Okay").definedBy("..testclasses..");
+                .layer("Okay").definedBy("..testclasses..")
+                .whereLayer("Other").mayOnlyBeAccessedByLayers("Some");
     }
 
     private void assertFailureLayeredArchitectureWithEmptyLayers(EvaluationResult result) {
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java
index b92c0416ac..deafea029a 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/GivenSlicesTest.java
@@ -12,6 +12,8 @@
 import com.tngtech.archunit.lang.syntax.elements.GivenConjunction;
 import com.tngtech.archunit.library.ArchitecturesTest;
 import com.tngtech.archunit.library.dependencies.syntax.GivenSlices;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
+import org.junit.Rule;
 import org.junit.Test;
 
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.have;
@@ -21,6 +23,9 @@
 public class GivenSlicesTest {
     static final String TEST_CLASSES_PACKAGE = ArchitecturesTest.class.getPackage().getName() + ".testclasses";
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule();
+
     @Test
     public void chosen_slices() {
         Set<Slice> slices = getSlicesMatchedByFilter(
@@ -46,6 +51,8 @@ public void chosen_slices() {
 
     @Test
     public void restricting_slices_that_should_not_depend_on_each_other() {
+        archConfigurationRule.setFailOnEmptyShould(false);
+
         GivenSlices givenSlices = slices().matching("..testclasses.(*)..");
         JavaClasses classes = new ClassFileImporter().importPackages("com.tngtech.archunit.library.testclasses");
 
@@ -85,4 +92,4 @@ public void check(Slice item, ConditionEvents events) {
         }).evaluate(new ClassFileImporter().importPackages(TEST_CLASSES_PACKAGE));
         return matched;
     }
-}
\ No newline at end of file
+}
diff --git a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java
index 7be30e5521..9debb606b6 100644
--- a/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java
+++ b/archunit/src/test/java/com/tngtech/archunit/library/dependencies/SliceRuleTest.java
@@ -16,6 +16,7 @@
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
 import org.assertj.core.api.Condition;
+import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +29,7 @@
 import static com.tngtech.java.junit.dataprovider.DataProviders.$$;
 import static java.lang.System.lineSeparator;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @RunWith(DataProviderRunner.class)
 public class SliceRuleTest {
@@ -147,6 +149,35 @@ public void limits_number_of_reported_dependencies_per_edge_by_default_to_20() {
                 "Dependencies of Slice threedependencies"));
     }
 
+    @Test
+    public void forbids_empty_should_by_default() {
+        assertThatThrownBy(new ThrowingCallable() {
+            @Override
+            public void call() {
+                ruleWithEmptyShould().check(new ClassFileImporter().importClasses(getClass()));
+            }
+        }).isInstanceOf(AssertionError.class)
+                .hasMessageContaining("failed to check any classes");
+    }
+
+    @Test
+    public void should_allow_empty_should_if_configured() {
+        configurationRule.setFailOnEmptyShould(false);
+
+        ruleWithEmptyShould().check(new ClassFileImporter().importClasses(getClass()));
+    }
+
+    @Test
+    public void allows_empty_should_if_overridden() {
+        configurationRule.setFailOnEmptyShould(true);
+
+        ruleWithEmptyShould().allowEmptyShould(true).check(new ClassFileImporter().importClasses(getClass()));
+    }
+
+    private static SliceRule ruleWithEmptyShould() {
+        return slices().matching("nothing_because_there_is_no_capture_group").should().beFreeOfCycles();
+    }
+
     private List<String> filterLinesMatching(String text, final String regex) {
         return FluentIterable.from(Splitter.on(lineSeparator()).split(text))
                 .filter(new Predicate<String>() {
diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java b/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java
index ab349c36b1..48acec827f 100644
--- a/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java
+++ b/archunit/src/test/java/com/tngtech/archunit/testutil/ArchConfigurationRule.java
@@ -1,56 +1,68 @@
 package com.tngtech.archunit.testutil;
 
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Callable;
 
 import com.tngtech.archunit.ArchConfiguration;
 import org.junit.rules.ExternalResource;
 
-import static com.tngtech.archunit.testutil.ReflectionTestUtils.field;
-import static com.tngtech.archunit.testutil.ReflectionTestUtils.method;
-
 public class ArchConfigurationRule extends ExternalResource {
-    private boolean resolveMissingDependenciesFromClassPath = ArchConfiguration.get().resolveMissingDependenciesFromClassPath();
+    public static final String FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME = "archRule.failOnEmptyShould";
 
-    public static <T> T resetConfigurationAround(Callable<T> callable) {
-        ArchConfiguration.get().reset();
-        try {
-            return callable.call();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            ArchConfiguration.get().reset();
-        }
-    }
+    private boolean beforeHasBeenExecuted = false;
+    private final List<Runnable> configurationInitializers = new ArrayList<>();
 
-    public ArchConfigurationRule resolveAdditionalDependenciesFromClassPath(boolean enabled) {
-        resolveMissingDependenciesFromClassPath = enabled;
+    public ArchConfigurationRule resolveAdditionalDependenciesFromClassPath(final boolean enabled) {
+        addConfigurationInitializer(new Runnable() {
+            @Override
+            public void run() {
+                ArchConfiguration.get().setResolveMissingDependenciesFromClassPath(enabled);
+            }
+        });
         return this;
     }
 
-    public void removeProperty(String propertyName) {
-        try {
-            Object properties = accessible(field(ArchConfiguration.class, "properties")).get(ArchConfiguration.get());
-            accessible(method(properties.getClass(), "remove", String.class)).invoke(properties, propertyName);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
+    public ArchConfigurationRule setFailOnEmptyShould(final boolean allowEmptyShould) {
+        addConfigurationInitializer(new Runnable() {
+            @Override
+            public void run() {
+                ArchConfiguration.get().setProperty(FAIL_ON_EMPTY_SHOULD_PROPERTY_NAME, String.valueOf(allowEmptyShould));
+            }
+        });
+        return this;
     }
 
-    private <T extends AccessibleObject> T accessible(T member) {
-        member.setAccessible(true);
-        return member;
+    private void addConfigurationInitializer(Runnable initializer) {
+        if (beforeHasBeenExecuted) {
+            initializer.run();
+        } else {
+            configurationInitializers.add(initializer);
+        }
     }
 
     @Override
     protected void before() {
         ArchConfiguration.get().reset();
-        ArchConfiguration.get().setResolveMissingDependenciesFromClassPath(resolveMissingDependenciesFromClassPath);
+        for (Runnable initializer : configurationInitializers) {
+            initializer.run();
+        }
+        beforeHasBeenExecuted = true;
     }
 
     @Override
     protected void after() {
         ArchConfiguration.get().reset();
     }
+
+    public static <T> T resetConfigurationAround(Callable<T> callable) {
+        ArchConfiguration.get().reset();
+        try {
+            return callable.call();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            ArchConfiguration.get().reset();
+        }
+    }
 }
diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/TestUtils.java b/archunit/src/test/java/com/tngtech/archunit/testutil/TestUtils.java
index 0636c73474..6aaf7fcd50 100644
--- a/archunit/src/test/java/com/tngtech/archunit/testutil/TestUtils.java
+++ b/archunit/src/test/java/com/tngtech/archunit/testutil/TestUtils.java
@@ -84,4 +84,12 @@ public static URL urlOf(Class<?> clazz) {
     public static URI uriOf(Class<?> clazz) {
         return toUri(urlOf(clazz));
     }
+
+    public static URI relativeResourceUri(Class<?> relativeToClass, String resourceName) {
+        try {
+            return relativeToClass.getResource("/" + relativeToClass.getPackage().getName().replace(".", "/") + "/" + resourceName).toURI();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/RandomSyntaxTestBase.java b/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/RandomSyntaxTestBase.java
index 8cd348bc72..cf1320a050 100644
--- a/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/RandomSyntaxTestBase.java
+++ b/archunit/src/test/java/com/tngtech/archunit/testutil/syntax/RandomSyntaxTestBase.java
@@ -18,8 +18,10 @@
 import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.ConditionEvents;
+import com.tngtech.archunit.testutil.ArchConfigurationRule;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -39,6 +41,9 @@ public abstract class RandomSyntaxTestBase {
     protected static final Random random = new Random();
     private static final int NUMBER_OF_RULES_TO_BUILD = 1000;
 
+    @Rule
+    public final ArchConfigurationRule archConfigurationRule = new ArchConfigurationRule().setFailOnEmptyShould(false);
+
     public static List<List<?>> createRandomRules(RandomSyntaxSeed<?> seed,
             DescriptionReplacement... replacements) {
         return createRandomRules(seed, MethodChoiceStrategy.chooseAllArchUnitSyntaxMethods(), replacements);
diff --git a/archunit/src/test/resources/archunit.properties b/archunit/src/test/resources/archunit.properties
index 19f5f4b93e..8e8235ded4 100644
--- a/archunit/src/test/resources/archunit.properties
+++ b/archunit/src/test/resources/archunit.properties
@@ -1,4 +1,3 @@
 enableMd5InClassSources=true
-archRule.failOnEmptyShould=false
 import.dependencyResolutionProcess.maxIterationsForEnclosingTypes=0
-import.dependencyResolutionProcess.maxIterationsForGenericSignatureTypes=0
\ No newline at end of file
+import.dependencyResolutionProcess.maxIterationsForGenericSignatureTypes=0
diff --git a/archunit/src/test/resources/com/tngtech/archunit/core/importer/testexamples/MismatchBetweenDescriptorAndSignature.class b/archunit/src/test/resources/com/tngtech/archunit/core/importer/testexamples/MismatchBetweenDescriptorAndSignature.class
new file mode 100644
index 0000000000..c4012f04c5
Binary files /dev/null and b/archunit/src/test/resources/com/tngtech/archunit/core/importer/testexamples/MismatchBetweenDescriptorAndSignature.class differ
diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
index d8514d95cf..2ca0d8bfe1 100644
--- a/docs/_data/navigation.yml
+++ b/docs/_data/navigation.yml
@@ -10,6 +10,6 @@ main:
   - title: "User Guide"
     url: /userguide/html/000_Index.html
   - title: "API"
-    url: https://javadoc.io/doc/com.tngtech.archunit/archunit/0.22.0
+    url: https://javadoc.io/doc/com.tngtech.archunit/archunit/0.23.1
   - title: "About"
     url: /about
diff --git a/docs/_pages/getting-started.md b/docs/_pages/getting-started.md
index b14278e608..677f21bb65 100644
--- a/docs/_pages/getting-started.md
+++ b/docs/_pages/getting-started.md
@@ -15,7 +15,7 @@ ArchUnit can be obtained from Maven Central.
 <dependency>
     <groupId>com.tngtech.archunit</groupId>
     <artifactId>archunit</artifactId>
-    <version>0.22.0</version>
+    <version>0.23.1</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -23,7 +23,7 @@ ArchUnit can be obtained from Maven Central.
 #### Gradle
 ```groovy
 dependencies {
-    testImplementation 'com.tngtech.archunit:archunit:0.22.0'
+    testImplementation 'com.tngtech.archunit:archunit:0.23.1'
 }
 ```
 
diff --git a/docs/_posts/2022-02-20-release-v0.23.0.markdown b/docs/_posts/2022-02-20-release-v0.23.0.markdown
new file mode 100644
index 0000000000..b40c4a14de
--- /dev/null
+++ b/docs/_posts/2022-02-20-release-v0.23.0.markdown
@@ -0,0 +1,8 @@
+---
+layout: splash
+title:  "New release of ArchUnit (v0.23.0)"
+date:   2022-02-20 12:00:00
+categories: news release
+---
+
+A new release of ArchUnit (v0.23.0) is out. For details see [the release on GitHub](https://github.com/TNG/ArchUnit/releases/tag/v0.23.0 "ArchUnit v0.23.0 on GitHub").
diff --git a/docs/_posts/2022-02-27-release-v0.23.1.markdown b/docs/_posts/2022-02-27-release-v0.23.1.markdown
new file mode 100644
index 0000000000..b80d541087
--- /dev/null
+++ b/docs/_posts/2022-02-27-release-v0.23.1.markdown
@@ -0,0 +1,8 @@
+---
+layout: splash
+title:  "New release of ArchUnit (v0.23.1)"
+date:   2022-02-27 12:00:00
+categories: news release
+---
+
+A new release of ArchUnit (v0.23.1) is out. For details see [the release on GitHub](https://github.com/TNG/ArchUnit/releases/tag/v0.23.1 "ArchUnit v0.23.1 on GitHub").
diff --git a/docs/userguide/010_Advanced_Configuration.adoc b/docs/userguide/010_Advanced_Configuration.adoc
index fdeb839fed..b626d7fbf4 100644
--- a/docs/userguide/010_Advanced_Configuration.adoc
+++ b/docs/userguide/010_Advanced_Configuration.adoc
@@ -158,8 +158,23 @@ However, it actually does not check any classes at all anymore.
 This is likely not what most users want.
 Thus, by default ArchUnit will fail checking the rule in this case.
 If you want to allow evaluating such rules,
-i.e. where the actual input to the should-conditionis empty,
-you can set the following property:
+i.e. where the actual input to the should-clause is empty,
+you can use one of the following ways:
+
+*Allow Empty Should on a Per-Rule Basis*
+
+On each `ArchRule` you can use the method `ArchRule.allowEmptyShould(..)` to override the behavior
+for a single rule, e.g.
+
+[source,java,options="nowrap"]
+----
+// create a rule that allows that no classes are passed to the should-clause
+classes().that()...should()...allowEmptyShould(true)
+----
+
+*Allow Empty Should Globally*
+
+To allow all rules to be evaluated without checking any classes you can set the following property:
 
 [source,options="nowrap"]
 .archunit.properties
diff --git a/docs/userguide/html/000_Index.html b/docs/userguide/html/000_Index.html
index 42547a99d5..9ab694ea59 100644
--- a/docs/userguide/html/000_Index.html
+++ b/docs/userguide/html/000_Index.html
@@ -449,7 +449,7 @@
 <div id="header">
 <h1>ArchUnit User Guide</h1>
 <div class="details">
-<span id="revnumber">version 0.22.0</span>
+<span id="revnumber">version 0.23.1</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -530,7 +530,8 @@ <h1>ArchUnit User Guide</h1>
 <li><a href="#_overriding_configuration">10.1. Overriding configuration</a></li>
 <li><a href="#_configuring_the_resolution_behavior">10.2. Configuring the Resolution Behavior</a></li>
 <li><a href="#_md5_sums_of_classes">10.3. MD5 Sums of Classes</a></li>
-<li><a href="#_custom_error_messages">10.4. Custom Error Messages</a></li>
+<li><a href="#_fail_rules_on_empty_should">10.4. Fail Rules on Empty Should</a></li>
+<li><a href="#_custom_error_messages">10.5. Custom Error Messages</a></li>
 </ul>
 </li>
 </ul>
@@ -616,7 +617,7 @@ <h3 id="_junit_4"><a class="anchor" href="#_junit_4"></a>2.1. JUnit 4</h3>
 <pre class="highlightjs highlight nowrap"><code data-lang="xml" class="language-xml hljs">&lt;dependency&gt;
     &lt;groupId&gt;com.tngtech.archunit&lt;/groupId&gt;
     &lt;artifactId&gt;archunit-junit4&lt;/artifactId&gt;
-    &lt;version&gt;0.22.0&lt;/version&gt;
+    &lt;version&gt;0.23.1&lt;/version&gt;
     &lt;scope&gt;test&lt;/scope&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
@@ -625,7 +626,7 @@ <h3 id="_junit_4"><a class="anchor" href="#_junit_4"></a>2.1. JUnit 4</h3>
 <div class="title">build.gradle</div>
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code class="language-none hljs">dependencies {
-    testImplementation 'com.tngtech.archunit:archunit-junit4:0.22.0'
+    testImplementation 'com.tngtech.archunit:archunit-junit4:0.23.1'
 }</code></pre>
 </div>
 </div>
@@ -646,7 +647,7 @@ <h3 id="_junit_5"><a class="anchor" href="#_junit_5"></a>2.2. JUnit 5</h3>
 <pre class="highlightjs highlight nowrap"><code data-lang="xml" class="language-xml hljs">&lt;dependency&gt;
     &lt;groupId&gt;com.tngtech.archunit&lt;/groupId&gt;
     &lt;artifactId&gt;archunit-junit5&lt;/artifactId&gt;
-    &lt;version&gt;0.22.0&lt;/version&gt;
+    &lt;version&gt;0.23.1&lt;/version&gt;
     &lt;scope&gt;test&lt;/scope&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
@@ -655,7 +656,7 @@ <h3 id="_junit_5"><a class="anchor" href="#_junit_5"></a>2.2. JUnit 5</h3>
 <div class="title">build.gradle</div>
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code class="language-none hljs">dependencies {
-    testImplementation 'com.tngtech.archunit:archunit-junit5:0.22.0'
+    testImplementation 'com.tngtech.archunit:archunit-junit5:0.23.1'
 }</code></pre>
 </div>
 </div>
@@ -672,7 +673,7 @@ <h3 id="_other_test_frameworks"><a class="anchor" href="#_other_test_frameworks"
 <pre class="highlightjs highlight nowrap"><code data-lang="xml" class="language-xml hljs">&lt;dependency&gt;
     &lt;groupId&gt;com.tngtech.archunit&lt;/groupId&gt;
     &lt;artifactId&gt;archunit&lt;/artifactId&gt;
-    &lt;version&gt;0.22.0&lt;/version&gt;
+    &lt;version&gt;0.23.1&lt;/version&gt;
     &lt;scope&gt;test&lt;/scope&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
@@ -681,7 +682,7 @@ <h3 id="_other_test_frameworks"><a class="anchor" href="#_other_test_frameworks"
 <div class="title">build.gradle</div>
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code class="language-none hljs">dependencies {
-   testImplementation 'com.tngtech.archunit:archunit:0.22.0'
+   testImplementation 'com.tngtech.archunit:archunit:0.23.1'
 }</code></pre>
 </div>
 </div>
@@ -848,7 +849,7 @@ <h2 id="_what_to_check"><a class="anchor" href="#_what_to_check"></a>4. What to
 <h3 id="_package_dependency_checks"><a class="anchor" href="#_package_dependency_checks"></a>4.1. Package Dependency Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="package-deps-no-access.png" alt="package deps no access" width="464" height="79">
+<img src="package-deps-no-access.png" alt="package deps no access" width="460" height="75">
 </div>
 </div>
 <div class="listingblock">
@@ -859,7 +860,7 @@ <h3 id="_package_dependency_checks"><a class="anchor" href="#_package_dependency
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="package-deps-only-access.png" alt="package deps only access" width="491" height="335">
+<img src="package-deps-only-access.png" alt="package deps only access" width="487" height="333">
 </div>
 </div>
 <div class="listingblock">
@@ -873,7 +874,7 @@ <h3 id="_package_dependency_checks"><a class="anchor" href="#_package_dependency
 <h3 id="_class_dependency_checks"><a class="anchor" href="#_class_dependency_checks"></a>4.2. Class Dependency Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="class-naming-deps.png" alt="class naming deps" width="320" height="215">
+<img src="class-naming-deps.png" alt="class naming deps" width="324" height="213">
 </div>
 </div>
 <div class="listingblock">
@@ -887,7 +888,7 @@ <h3 id="_class_dependency_checks"><a class="anchor" href="#_class_dependency_che
 <h3 id="_class_and_package_containment_checks"><a class="anchor" href="#_class_and_package_containment_checks"></a>4.3. Class and Package Containment Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="class-package-contain.png" alt="class package contain" width="343" height="180">
+<img src="class-package-contain.png" alt="class package contain" width="348" height="203">
 </div>
 </div>
 <div class="listingblock">
@@ -901,7 +902,7 @@ <h3 id="_class_and_package_containment_checks"><a class="anchor" href="#_class_a
 <h3 id="_inheritance_checks"><a class="anchor" href="#_inheritance_checks"></a>4.4. Inheritance Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="inheritance-naming-check.png" alt="inheritance naming check" width="464" height="226">
+<img src="inheritance-naming-check.png" alt="inheritance naming check" width="468" height="224">
 </div>
 </div>
 <div class="listingblock">
@@ -912,7 +913,7 @@ <h3 id="_inheritance_checks"><a class="anchor" href="#_inheritance_checks"></a>4
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="inheritance-access-check.png" alt="inheritance access check" width="558" height="251">
+<img src="inheritance-access-check.png" alt="inheritance access check" width="569" height="266">
 </div>
 </div>
 <div class="listingblock">
@@ -926,7 +927,7 @@ <h3 id="_inheritance_checks"><a class="anchor" href="#_inheritance_checks"></a>4
 <h3 id="_annotation_checks"><a class="anchor" href="#_annotation_checks"></a>4.5. Annotation Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="inheritance-annotation-check.png" alt="inheritance annotation check" width="583" height="221">
+<img src="inheritance-annotation-check.png" alt="inheritance annotation check" width="587" height="219">
 </div>
 </div>
 <div class="listingblock">
@@ -940,7 +941,7 @@ <h3 id="_annotation_checks"><a class="anchor" href="#_annotation_checks"></a>4.5
 <h3 id="_layer_checks"><a class="anchor" href="#_layer_checks"></a>4.6. Layer Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="layer-check.png" alt="layer check" width="632" height="575">
+<img src="layer-check.png" alt="layer check" width="643" height="598">
 </div>
 </div>
 <div class="listingblock">
@@ -960,7 +961,7 @@ <h3 id="_layer_checks"><a class="anchor" href="#_layer_checks"></a>4.6. Layer Ch
 <h3 id="_cycle_checks"><a class="anchor" href="#_cycle_checks"></a>4.7. Cycle Checks</h3>
 <div class="imageblock">
 <div class="content">
-<img src="cycle-check.png" alt="cycle check" width="738" height="375">
+<img src="cycle-check.png" alt="cycle check" width="749" height="398">
 </div>
 </div>
 <div class="listingblock">
@@ -1168,7 +1169,7 @@ <h3 id="_domain"><a class="anchor" href="#_domain"></a>6.2. Domain</h3>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="domain-overview.png" alt="domain overview" width="988" height="693">
+<img src="domain-overview.png" alt="domain overview" width="984" height="691">
 </div>
 </div>
 <div class="paragraph">
@@ -1197,7 +1198,7 @@ <h3 id="_domain"><a class="anchor" href="#_domain"></a>6.2. Domain</h3>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="resolution-example.png" alt="resolution example" width="379" height="189">
+<img src="resolution-example.png" alt="resolution example" width="375" height="187">
 </div>
 </div>
 <div class="paragraph">
@@ -1212,7 +1213,7 @@ <h3 id="_domain"><a class="anchor" href="#_domain"></a>6.2. Domain</h3>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="resolution-overview.png" alt="resolution overview" width="547" height="318">
+<img src="resolution-overview.png" alt="resolution overview" width="543" height="316">
 </div>
 </div>
 <div class="paragraph">
@@ -1232,7 +1233,7 @@ <h3 id="_domain"><a class="anchor" href="#_domain"></a>6.2. Domain</h3>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="diamond-example.png" alt="diamond example" width="517" height="224">
+<img src="diamond-example.png" alt="diamond example" width="513" height="222">
 </div>
 </div>
 <div class="paragraph">
@@ -1588,7 +1589,7 @@ <h3 id="_rules_with_custom_concepts"><a class="anchor" href="#_rules_with_custom
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="import-vs-lang.png" alt="import vs lang" width="714" height="81">
+<img src="import-vs-lang.png" alt="import vs lang" width="710" height="79">
 </div>
 </div>
 <div class="paragraph">
@@ -1782,7 +1783,7 @@ <h4 id="_onion_architecture"><a class="anchor" href="#_onion_architecture"></a>8
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="onion-architecture-check.png" alt="onion architecture check" width="1180" height="748">
+<img src="onion-architecture-check.png" alt="onion architecture check" width="1139" height="771">
 </div>
 </div>
 </div>
@@ -1969,7 +1970,7 @@ <h3 id="_plantuml_component_diagrams_as_rules"><a class="anchor" href="#_plantum
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="simple-plantuml-archrule-example.png" alt="simple plantuml archrule example" width="183" height="205">
+<img src="simple-plantuml-archrule-example.png" alt="simple plantuml archrule example" width="159" height="183">
 </div>
 </div>
 <div class="listingblock">
@@ -2272,7 +2273,7 @@ <h4 id="_cumulative_dependency_metrics_by_john_lakos"><a class="anchor" href="#_
 <h5 id="_example"><a class="anchor" href="#_example"></a>Example</h5>
 <div class="imageblock">
 <div class="content">
-<img src="lakos-example.png" alt="lakos example" width="470" height="553">
+<img src="lakos-example.png" alt="lakos example" width="466" height="547">
 </div>
 </div>
 <div class="paragraph">
@@ -2357,7 +2358,7 @@ <h5 id="_example_2"><a class="anchor" href="#_example_2"></a>Example</h5>
 </div>
 <div class="imageblock">
 <div class="content">
-<img src="martin-example.png" alt="martin example" width="470" height="711">
+<img src="martin-example.png" alt="martin example" width="466" height="709">
 </div>
 </div>
 </div>
@@ -2416,7 +2417,7 @@ <h4 id="_visibility_metrics_by_herbert_dowalil"><a class="anchor" href="#_visibi
 <h5 id="_example_3"><a class="anchor" href="#_example_3"></a>Example</h5>
 <div class="imageblock">
 <div class="content">
-<img src="dowalil-example.png" alt="dowalil example" width="712" height="318">
+<img src="dowalil-example.png" alt="dowalil example" width="723" height="351">
 </div>
 </div>
 </div>
@@ -2808,6 +2809,72 @@ <h3 id="_configuring_the_resolution_behavior"><a class="anchor" href="#_configur
 <div class="paragraph">
 <p>For further details, compare the sources of <code>SelectedClassResolverFromClasspath</code>.</p>
 </div>
+<div class="sect3">
+<h4 id="_configuring_the_number_of_resolution_iterations"><a class="anchor" href="#_configuring_the_number_of_resolution_iterations"></a>10.2.1. Configuring the Number of Resolution Iterations</h4>
+<div class="paragraph">
+<p>It is also possible to apply a more fine-grained configuration to the import dependency resolution behavior.</p>
+</div>
+<div class="paragraph">
+<p>In particular, the ArchUnit importer distinguishes 6 types of import dependencies:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>member types (e.g. the type of a field of a class, type of a method parameter, etc.)</p>
+</li>
+<li>
+<p>accesses to types (e.g. a method calls another method of a different class)</p>
+</li>
+<li>
+<p>supertypes (i.e. superclasses that are extended and interfaces that are implemented)</p>
+</li>
+<li>
+<p>enclosing types (i.e. outer classes of nested classes)</p>
+</li>
+<li>
+<p>annotation types, including parameters of annotations</p>
+</li>
+<li>
+<p>generic signature types (i.e. types that comprise a parameterized type, like <code>List</code> and <code>String</code> for <code>List&lt;String&gt;</code>)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For each of these dependency types it is possible to configure the maximum number of iterations to traverse the dependencies.
+E.g. let us assume we configure the maximum iterations as <code>2</code> for member types and we have a class <code>A</code> that declares a field of type <code>B</code> which in turn holds a field of type <code>C</code>.
+On the first run we would automatically resolve the type <code>B</code> as a dependency of <code>A</code>.
+On the second run we would then also resolve <code>C</code> as a member type dependency of <code>B</code>.</p>
+</div>
+<div class="paragraph">
+<p>The configuration parameters with their defaults are the following:</p>
+</div>
+<div class="listingblock">
+<div class="title">archunit.properties</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code class="language-none hljs">import.dependencyResolutionProcess.maxIterationsForMemberTypes = 1
+import.dependencyResolutionProcess.maxIterationsForAccessesToTypes = 1
+import.dependencyResolutionProcess.maxIterationsForSupertypes = -1
+import.dependencyResolutionProcess.maxIterationsForEnclosingTypes = -1
+import.dependencyResolutionProcess.maxIterationsForAnnotationTypes = -1
+import.dependencyResolutionProcess.maxIterationsForGenericSignatureTypes = -1</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Note that setting a property to a negative value (e.g. <code>-1</code>) will not stop the resolution until all types for the given sort of dependency have been resolved.
+E.g. for generic type signatures a value of <code>-1</code> will by default lead to all types comprising the signature <code>Map&lt;?, List&lt;? extends String&gt;&gt;</code> (that is <code>Map</code>, <code>List</code> and <code>String</code>) to be automatically resolved.</p>
+</div>
+<div class="paragraph">
+<p>Setting a property to <code>0</code> will disable the automatic resolution,
+which can lead to types being only partially imported or stubbed.
+For these types the information is likely not complete or even wrong (e.g. an interface might be reported as class if the bytecode was never analyzed, or annotations might be missing).</p>
+</div>
+<div class="paragraph">
+<p>On the other hand, bigger (or negative) values can have a massive performance impact.
+The defaults should provide a reasonable behavior.
+They include the class graph for all types that are used by members or accesses directly and cut the resolution at that point.
+However, relevant information for these types is fully imported, no matter how many iterations it takes (e.g. supertypes or generic signatures).</p>
+</div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_md5_sums_of_classes"><a class="anchor" href="#_md5_sums_of_classes"></a>10.3. MD5 Sums of Classes</h3>
@@ -2832,7 +2899,55 @@ <h3 id="_md5_sums_of_classes"><a class="anchor" href="#_md5_sums_of_classes"></a
 </div>
 </div>
 <div class="sect2">
-<h3 id="_custom_error_messages"><a class="anchor" href="#_custom_error_messages"></a>10.4. Custom Error Messages</h3>
+<h3 id="_fail_rules_on_empty_should"><a class="anchor" href="#_fail_rules_on_empty_should"></a>10.4. Fail Rules on Empty Should</h3>
+<div class="paragraph">
+<p>By default, ArchUnit will forbid the should-part of rules to be evaluated against an empty set of classes.
+The reason is that this can lead to rules that by accident do not check any classes at all.
+Take for example</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="java" class="language-java hljs">classes().that().resideInAPackage("com.myapp.old").should()...</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now consider somebody renames the package <code>old</code> to <code>newer</code>.
+The rule will now always evaluate successfully without any reported error.
+However, it actually does not check any classes at all anymore.
+This is likely not what most users want.
+Thus, by default ArchUnit will fail checking the rule in this case.
+If you want to allow evaluating such rules,
+i.e. where the actual input to the should-clause is empty,
+you can use one of the following ways:</p>
+</div>
+<div class="paragraph">
+<p><strong>Allow Empty Should on a Per-Rule Basis</strong></p>
+</div>
+<div class="paragraph">
+<p>On each <code>ArchRule</code> you can use the method <code>ArchRule.allowEmptyShould(..)</code> to override the behavior
+for a single rule, e.g.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="java" class="language-java hljs">// create a rule that allows that no classes are passed to the should-clause
+classes().that()...should()...allowEmptyShould(true)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>Allow Empty Should Globally</strong></p>
+</div>
+<div class="paragraph">
+<p>To allow all rules to be evaluated without checking any classes you can set the following property:</p>
+</div>
+<div class="listingblock">
+<div class="title">archunit.properties</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code class="language-none hljs">archRule.failOnEmptyShould=false</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_custom_error_messages"><a class="anchor" href="#_custom_error_messages"></a>10.5. Custom Error Messages</h3>
 <div class="paragraph">
 <p>You can configure a custom format to display the failures of a rule.</p>
 </div>
diff --git a/docs/userguide/html/class-naming-deps.png b/docs/userguide/html/class-naming-deps.png
index eb428359ef..d5fc299ae0 100644
Binary files a/docs/userguide/html/class-naming-deps.png and b/docs/userguide/html/class-naming-deps.png differ
diff --git a/docs/userguide/html/class-package-contain.png b/docs/userguide/html/class-package-contain.png
index 54a5ad34ef..ce679d36f5 100644
Binary files a/docs/userguide/html/class-package-contain.png and b/docs/userguide/html/class-package-contain.png differ
diff --git a/docs/userguide/html/cycle-check.png b/docs/userguide/html/cycle-check.png
index 85f4cd0cd9..b72da8d33f 100644
Binary files a/docs/userguide/html/cycle-check.png and b/docs/userguide/html/cycle-check.png differ
diff --git a/docs/userguide/html/diamond-example.png b/docs/userguide/html/diamond-example.png
index d62616de40..aca0dabdb5 100644
Binary files a/docs/userguide/html/diamond-example.png and b/docs/userguide/html/diamond-example.png differ
diff --git a/docs/userguide/html/domain-overview.png b/docs/userguide/html/domain-overview.png
index 49cf5b0014..7ad81efe3a 100644
Binary files a/docs/userguide/html/domain-overview.png and b/docs/userguide/html/domain-overview.png differ
diff --git a/docs/userguide/html/dowalil-example.png b/docs/userguide/html/dowalil-example.png
index b853bdfecd..4651801c53 100644
Binary files a/docs/userguide/html/dowalil-example.png and b/docs/userguide/html/dowalil-example.png differ
diff --git a/docs/userguide/html/import-vs-lang.png b/docs/userguide/html/import-vs-lang.png
index 698474c1f4..26d744bf55 100644
Binary files a/docs/userguide/html/import-vs-lang.png and b/docs/userguide/html/import-vs-lang.png differ
diff --git a/docs/userguide/html/inheritance-access-check.png b/docs/userguide/html/inheritance-access-check.png
index 8300e36ddb..48e6a51314 100644
Binary files a/docs/userguide/html/inheritance-access-check.png and b/docs/userguide/html/inheritance-access-check.png differ
diff --git a/docs/userguide/html/inheritance-annotation-check.png b/docs/userguide/html/inheritance-annotation-check.png
index c375d7d45b..e912ed9aac 100644
Binary files a/docs/userguide/html/inheritance-annotation-check.png and b/docs/userguide/html/inheritance-annotation-check.png differ
diff --git a/docs/userguide/html/inheritance-naming-check.png b/docs/userguide/html/inheritance-naming-check.png
index 60ab7dfb2d..4979fba894 100644
Binary files a/docs/userguide/html/inheritance-naming-check.png and b/docs/userguide/html/inheritance-naming-check.png differ
diff --git a/docs/userguide/html/lakos-example.png b/docs/userguide/html/lakos-example.png
index cf1745539e..cd331d7cad 100644
Binary files a/docs/userguide/html/lakos-example.png and b/docs/userguide/html/lakos-example.png differ
diff --git a/docs/userguide/html/layer-check.png b/docs/userguide/html/layer-check.png
index 072ae36c0d..c5ca132069 100644
Binary files a/docs/userguide/html/layer-check.png and b/docs/userguide/html/layer-check.png differ
diff --git a/docs/userguide/html/martin-example.png b/docs/userguide/html/martin-example.png
index e575c782f8..ab28277e92 100644
Binary files a/docs/userguide/html/martin-example.png and b/docs/userguide/html/martin-example.png differ
diff --git a/docs/userguide/html/onion-architecture-check.png b/docs/userguide/html/onion-architecture-check.png
index 6c4ec48be1..35092c5820 100644
Binary files a/docs/userguide/html/onion-architecture-check.png and b/docs/userguide/html/onion-architecture-check.png differ
diff --git a/docs/userguide/html/package-deps-no-access.png b/docs/userguide/html/package-deps-no-access.png
index dfd811acbe..b558261658 100644
Binary files a/docs/userguide/html/package-deps-no-access.png and b/docs/userguide/html/package-deps-no-access.png differ
diff --git a/docs/userguide/html/package-deps-only-access.png b/docs/userguide/html/package-deps-only-access.png
index 19779b6a80..ad6ef8a7a8 100644
Binary files a/docs/userguide/html/package-deps-only-access.png and b/docs/userguide/html/package-deps-only-access.png differ
diff --git a/docs/userguide/html/resolution-example.png b/docs/userguide/html/resolution-example.png
index dee4b0db9c..f1352c0826 100644
Binary files a/docs/userguide/html/resolution-example.png and b/docs/userguide/html/resolution-example.png differ
diff --git a/docs/userguide/html/resolution-overview.png b/docs/userguide/html/resolution-overview.png
index f7bc989a44..66ccdf4f27 100644
Binary files a/docs/userguide/html/resolution-overview.png and b/docs/userguide/html/resolution-overview.png differ
diff --git a/docs/userguide/html/simple-plantuml-archrule-example.png b/docs/userguide/html/simple-plantuml-archrule-example.png
index 8d6e14e20d..2c61332554 100644
Binary files a/docs/userguide/html/simple-plantuml-archrule-example.png and b/docs/userguide/html/simple-plantuml-archrule-example.png differ
diff --git a/gradle.properties b/gradle.properties
index 427bc2b24a..58550ba2dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel=true
 archunit.group=com.tngtech.archunit
-archunit.version=0.23.0-SNAPSHOT
+archunit.version=0.24.0-SNAPSHOT
 org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED