diff --git a/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java b/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java
index d7fcea5..120e5a7 100644
--- a/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java
+++ b/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java
@@ -34,9 +34,7 @@ import java.util.concurrent.CompletableFuture;
 public final class FileSuggestionProvider implements SuggestionProvider<ServerCommandSource> {
     private static final FileSuggestionProvider INSTANCE = new FileSuggestionProvider();
 
-    public static FileSuggestionProvider Instance() {
-        return INSTANCE;
-    }
+    public static FileSuggestionProvider Instance() { return INSTANCE; }
 
     @Override
     public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> ctx, SuggestionsBuilder builder) {
@@ -47,14 +45,14 @@ public final class FileSuggestionProvider implements SuggestionProvider<ServerCo
 
             if (formattedCreationTime.startsWith(remaining)) {
                 if (Utilities.wasSentByPlayer(ctx.getSource())) {  //was typed by player
-                    if (file.getComment() != null) {
-                        builder.suggest(formattedCreationTime, new LiteralMessage("Comment: " + file.getComment()));
+                    if (file.getComment().isPresent()) {
+                        builder.suggest(formattedCreationTime, new LiteralMessage("Comment: " + file.getComment().get()));
                     } else {
                         builder.suggest(formattedCreationTime);
                     }
                 } else {  //was typed from server console
-                    if (file.getComment() != null) {
-                        builder.suggest(file.getCreationTime() + "#" + file.getComment());
+                    if (file.getComment().isPresent()) {
+                        builder.suggest(file.getCreationTime() + "#" + file.getComment().get());
                     } else {
                         builder.suggest(formattedCreationTime);
                     }
diff --git a/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java b/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java
index 2725470..8684045 100644
--- a/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java
+++ b/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java
@@ -107,7 +107,7 @@ public class RestoreableFile implements Comparable<RestoreableFile> {
 
      public LocalDateTime getCreationTime() { return creationTime; }
 
-    public String getComment() { return comment; }
+    public Optional<String> getComment() { return Optional.ofNullable(comment); }
 
     @Override
     public int compareTo(@NotNull RestoreableFile o) { return creationTime.compareTo(o.creationTime); }