diff --git a/src/main/java/de/thm/arsnova/aop/RangeAspect.java b/src/main/java/de/thm/arsnova/aop/RangeAspect.java index 03bd80fb085317e73b49fdfa431fa2d05106756c..e53d29c1f171887a6df805d72a06a722bf8505f0 100644 --- a/src/main/java/de/thm/arsnova/aop/RangeAspect.java +++ b/src/main/java/de/thm/arsnova/aop/RangeAspect.java @@ -83,7 +83,7 @@ public class RangeAspect { List<?> list = (List<?>) pjp.proceed(); - if (matcher != null && matcher.matches()) { + if (list != null && matcher != null && matcher.matches()) { int totalSize = -1; if (list instanceof PaginationListDecorator) { PaginationListDecorator<?> pl = (PaginationListDecorator<?>) list;