diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
index 31c100e5c4..9d03a10df5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -378,7 +378,7 @@ protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<Ti
 					String name=editText.getText().toString().trim();
 
 					String mainHashtag=tagMain.getText().toString().trim();
-					if(item.getType()==TimelineDefinition.TimelineType.HASHTAG){
+					if(item != null && item.getType()==TimelineDefinition.TimelineType.HASHTAG){
 						tagsAny.chipifyAllUnterminatedTokens();
 						tagsAll.chipifyAllUnterminatedTokens();
 						tagsNone.chipifyAllUnterminatedTokens();
@@ -397,7 +397,7 @@ protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<Ti
 					TimelineDefinition.Icon icon=TimelineDefinition.Icon.values()[(int) btn.getTag()];
 					tl.setIcon(icon);
 					tl.setTitle(name);
-					if(item.getType()==TimelineDefinition.TimelineType.HASHTAG){
+					if(item == null || item.getType()==TimelineDefinition.TimelineType.HASHTAG){
 						tl.setTagOptions(
 								mainHashtag,
 								tagsAny.getChipValues(),