diff --git a/src/main/java/org/springframework/data/domain/AbstractAggregateRoot.java b/src/main/java/org/springframework/data/domain/AbstractAggregateRoot.java
index 0981af943..1be2d258d 100644
--- a/src/main/java/org/springframework/data/domain/AbstractAggregateRoot.java
+++ b/src/main/java/org/springframework/data/domain/AbstractAggregateRoot.java
@@ -20,19 +20,43 @@ import lombok.Getter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.util.Assert;
+
 /**
+ * Convenience base class for aggregate roots that exposes a {@link #registerEvent(Object)} to capture domain events and
+ * expose them via {@link #getDomainEvents()}. The implementation is using the general event publication mechanism
+ * implied by {@link DomainEvents} and {@link AfterDomainEventPublication}. If in doubt or need to customize anything
+ * here, rather build your own base class and use the annotations directly.
+ * 
  * @author Oliver Gierke
+ * @since 1.13
  */
 public class AbstractAggregateRoot {
 
-	private transient final @Getter(onMethod = @__(@DomainEvents)) List<Object> domainEvents = new ArrayList<Object>();
+	/**
+	 * All domain events currently captured by the aggregate.
+	 */
+	@Getter(onMethod = @__(@DomainEvents)) //
+	private transient final List<Object> domainEvents = new ArrayList<Object>();
 
+	/**
+	 * Registers the given event object for publication on a call to a Spring Data repository's save method.
+	 * 
+	 * @param event must not be {@literal null}.
+	 * @return
+	 */
 	protected <T> T registerEvent(T event) {
 
+		Assert.notNull(event, "Domain event must not be null!");
+
 		this.domainEvents.add(event);
 		return event;
 	}
 
+	/**
+	 * Clears all domain events currently held. Usually invoked by the infrastructure in place in Spring Data
+	 * repositories.
+	 */
 	@AfterDomainEventPublication
 	public void clearDomainEvents() {
 		this.domainEvents.clear();
diff --git a/src/main/java/org/springframework/data/domain/AfterDomainEventPublication.java b/src/main/java/org/springframework/data/domain/AfterDomainEventPublication.java
index 6badfbae1..48d3d4733 100644
--- a/src/main/java/org/springframework/data/domain/AfterDomainEventPublication.java
+++ b/src/main/java/org/springframework/data/domain/AfterDomainEventPublication.java
@@ -26,6 +26,7 @@ import java.lang.annotation.Target;
  * 
  * @author Oliver Gierke
  * @see DomainEvents
+ * @since 1.13
  * @soundtrack Benny Greb - September (Moving Parts Live)
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/springframework/data/domain/DomainEvents.java b/src/main/java/org/springframework/data/domain/DomainEvents.java
index 0493af1f3..a184d9cf7 100644
--- a/src/main/java/org/springframework/data/domain/DomainEvents.java
+++ b/src/main/java/org/springframework/data/domain/DomainEvents.java
@@ -29,6 +29,7 @@ import org.springframework.context.ApplicationEventPublisher;
  * @author Oliver Gierke
  * @see ApplicationEventPublisher
  * @see AfterDomainEventPublication
+ * @since 1.13
  * @soundtrack Benny Greb - Soulfood (Moving Parts Live)
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java b/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java
index fba2317f1..e517c69dc 100644
--- a/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java
+++ b/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java
@@ -40,8 +40,8 @@ import org.springframework.util.ReflectionUtils;
  * {@link RepositoryProxyPostProcessor} to register a {@link MethodInterceptor} to intercept the
  * {@link CrudRepository#save(Object)} method and publish events potentially exposed via a method annotated with
  * {@link DomainEvents}. If no such method can be detected on the aggregate root, no interceptor is added. Additionally,
- * the aggregate root can expose a method annotated with {@link AfterDomainEventPublication}. If present, the method will be
- * invoked after all events have been published.
+ * the aggregate root can expose a method annotated with {@link AfterDomainEventPublication}. If present, the method
+ * will be invoked after all events have been published.
  * 
  * @author Oliver Gierke
  * @since 1.13
diff --git a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
index d02d5b308..a267fccfa 100644
--- a/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
+++ b/src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2015 the original author or authors.
+ * Copyright 2008-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.