diff --git a/core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java b/core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java
index 718c6db..99c7b38 100644
--- a/core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java
+++ b/core/src/main/java/org/springframework/plugin/core/OrderAwarePluginRegistry.java
@@ -55,6 +55,7 @@ public class OrderAwarePluginRegistry<T extends Plugin<S>, S> extends SimplePlug
 	 * @param comparator the {@link Comparator} to be used for ordering the {@link Plugin}s or {@literal null} if the
 	 *          {@code #DEFAULT_COMPARATOR} shall be used.
 	 */
+	@SuppressWarnings("unchecked")
 	protected OrderAwarePluginRegistry(List<? extends T> plugins, Comparator<? super T> comparator) {
 
 		super(plugins);
@@ -69,8 +70,7 @@ public class OrderAwarePluginRegistry<T extends Plugin<S>, S> extends SimplePlug
 	 * @return
 	 */
 	public static <S, T extends Plugin<S>> OrderAwarePluginRegistry<T, S> create() {
-
-		return create(null, null);
+		return create(Collections.<T> emptyList());
 	}
 
 	/**
@@ -82,7 +82,7 @@ public class OrderAwarePluginRegistry<T extends Plugin<S>, S> extends SimplePlug
 	 * @return
 	 */
 	public static <S, T extends Plugin<S>> OrderAwarePluginRegistry<T, S> create(Comparator<? super T> comparator) {
-		return create(null, comparator);
+		return create(Collections.<T> emptyList(), comparator);
 	}
 
 	/**
diff --git a/core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java b/core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java
index 47771f0..3515991 100644
--- a/core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java
+++ b/core/src/main/java/org/springframework/plugin/core/SimplePluginRegistry.java
@@ -74,10 +74,10 @@ public class SimplePluginRegistry<T extends Plugin<S>, S> extends PluginRegistry
 	 */
 	public T getPluginFor(S delimiter) {
 
-		List<T> result = getPluginsFor(delimiter);
-
-		if (0 < result.size()) {
-			return result.get(0);
+		for (T plugin : super.getPlugins()) {
+			if (plugin != null && plugin.supports(delimiter)) {
+				return plugin;
+			}
 		}
 
 		return null;
diff --git a/core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java b/core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java
index 6135006..0a7e522 100644
--- a/core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java
+++ b/core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
 import static org.springframework.plugin.core.OrderAwarePluginRegistry.*;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.Before;
@@ -27,6 +28,7 @@ import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
+import org.springframework.test.util.ReflectionTestUtils;
 
 /**
  * Unit test for {@link OrderAwarePluginRegistry} that especially concentrates on testing ordering functionality.
@@ -95,6 +97,25 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe
 		assertOrder(registry.reverse(), firstPlugin, thirdPlugin, secondPlugin);
 	}
 
+	@Test
+	public void defaultSetupUsesDefaultComparator() {
+		assertDefaultComparator(OrderAwarePluginRegistry.<String, TestPlugin> create());
+	}
+
+	@Test
+	public void defaultSetupUsesDefaultReverseComparator() {
+		OrderAwarePluginRegistry<Plugin<Object>, Object> registry = OrderAwarePluginRegistry.createReverse(Collections
+				.<Plugin<Object>> emptyList());
+		Object field = ReflectionTestUtils.getField(registry, "comparator");
+		assertThat(field, is(ReflectionTestUtils.getField(registry, "DEFAULT_REVERSE_COMPARATOR")));
+	}
+
+	private static void assertDefaultComparator(OrderAwarePluginRegistry<?, ?> registry) {
+
+		Object field = ReflectionTestUtils.getField(registry, "comparator");
+		assertThat(field, is(ReflectionTestUtils.getField(registry, "DEFAULT_COMPARATOR")));
+	}
+
 	private static interface TestPlugin extends Plugin<String> {
 
 	}