diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/concrete/ThreadChannel.java b/src/main/java/net/dv8tion/jda/api/entities/channel/concrete/ThreadChannel.java
index 4f3c712b9c..cb6b190bd1 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/concrete/ThreadChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/concrete/ThreadChannel.java
@@ -284,7 +284,7 @@ default ThreadMember getSelfThreadMember()
      * @see    #retrieveThreadMember(Member)
      */
     @Nullable
-    default ThreadMember getThreadMember(Member member)
+    default ThreadMember getThreadMember(@Nonnull Member member)
     {
         Checks.notNull(member, "Member");
         return getThreadMemberById(member.getId());
@@ -309,7 +309,7 @@ default ThreadMember getThreadMember(Member member)
      * @see    #retrieveThreadMember(Member)
      */
     @Nullable
-    default ThreadMember getThreadMember(User user)
+    default ThreadMember getThreadMember(@Nonnull User user)
     {
         Checks.notNull(user, "User");
         return getThreadMemberById(user.getId());
@@ -334,7 +334,7 @@ default ThreadMember getThreadMember(User user)
      * @see    #retrieveThreadMember(Member)
      */
     @Nullable
-    default ThreadMember getThreadMemberById(String id)
+    default ThreadMember getThreadMemberById(@Nonnull String id)
     {
         return getThreadMemberById(MiscUtil.parseSnowflake(id));
     }
@@ -545,6 +545,7 @@ default ThreadMember getOwnerThreadMember()
      *
      * @see    ChannelField#ARCHIVED_TIMESTAMP
      */
+    @Nonnull
     OffsetDateTime getTimeArchiveInfoLastModified();
 
     /**
@@ -594,6 +595,7 @@ default ThreadMember getOwnerThreadMember()
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     RestAction<Void> join();
 
@@ -616,6 +618,7 @@ default ThreadMember getOwnerThreadMember()
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     RestAction<Void> leave();
 
@@ -656,6 +659,7 @@ default ThreadMember getOwnerThreadMember()
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     RestAction<Void> addThreadMemberById(long id);
 
@@ -696,6 +700,7 @@ default ThreadMember getOwnerThreadMember()
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     default RestAction<Void> addThreadMemberById(@Nonnull String id)
     {
@@ -732,6 +737,7 @@ default RestAction<Void> addThreadMemberById(@Nonnull String id)
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     default RestAction<Void> addThreadMember(@Nonnull User user)
     {
@@ -769,6 +775,7 @@ default RestAction<Void> addThreadMember(@Nonnull User user)
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     default RestAction<Void> addThreadMember(@Nonnull Member member)
     {
@@ -808,6 +815,7 @@ default RestAction<Void> addThreadMember(@Nonnull Member member)
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     RestAction<Void> removeThreadMemberById(long id);
 
@@ -845,6 +853,7 @@ default RestAction<Void> addThreadMember(@Nonnull Member member)
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     default RestAction<Void> removeThreadMemberById(@Nonnull String id)
     {
@@ -879,6 +888,7 @@ default RestAction<Void> removeThreadMemberById(@Nonnull String id)
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     default RestAction<Void> removeThreadMember(@Nonnull User user)
     {
@@ -914,6 +924,7 @@ default RestAction<Void> removeThreadMember(@Nonnull User user)
      *
      * @return {@link RestAction}
      */
+    @Nonnull
     @CheckReturnValue
     default RestAction<Void> removeThreadMember(@Nonnull Member member)
     {