diff --git a/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java b/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java
index 7369dcab1..c6bf5549c 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/identity/AuthorInfo.java
@@ -1,6 +1,7 @@
 package org.briarproject.briar.api.identity;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NullSafety;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import javax.annotation.Nullable;
@@ -60,13 +61,10 @@ public class AuthorInfo {
 	public boolean equals(Object o) {
 		if (!(o instanceof AuthorInfo)) return false;
 		AuthorInfo info = (AuthorInfo) o;
-		//noinspection EqualsReplaceableByObjectsCall
 		return status == info.status &&
 				// aliases are equal
-				(alias == null ? info.alias == null :
-						alias.equals(info.alias)) &&
+				NullSafety.equals(alias, info.alias) &&
 				// avatars are equal
-				(avatarHeader == null ? info.avatarHeader == null :
-						avatarHeader.equals(info.avatarHeader));
+				NullSafety.equals(avatarHeader, info.avatarHeader);
 	}
 }