diff --git a/src/main/java/fiji/plugin/trackmate/io/TmXmlReader.java b/src/main/java/fiji/plugin/trackmate/io/TmXmlReader.java
index 9f5faf46e..267ce5d41 100644
--- a/src/main/java/fiji/plugin/trackmate/io/TmXmlReader.java
+++ b/src/main/java/fiji/plugin/trackmate/io/TmXmlReader.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
diff --git a/src/main/java/fiji/plugin/trackmate/util/TMUtils.java b/src/main/java/fiji/plugin/trackmate/util/TMUtils.java
index 2896511f5..4acca565c 100644
--- a/src/main/java/fiji/plugin/trackmate/util/TMUtils.java
+++ b/src/main/java/fiji/plugin/trackmate/util/TMUtils.java
@@ -745,7 +745,7 @@ public static File proposeTrackMateSaveFile( final Settings settings, final Logg
 			 */
 			settings.imageFolder = settings.imp.getOriginalFileInfo().directory;
 		}
-		else if ( !settings.imageFolder.isEmpty() )
+		else if ( null != settings.imageFolder && !settings.imageFolder.isEmpty() )
 		{
 			final String absolutePath = FileSystems.getDefault().getPath( settings.imageFolder ).normalize().toAbsolutePath().toString();
 			folder = new File( absolutePath );
diff --git a/src/main/java/fiji/plugin/trackmate/util/cli/CLIUtils.java b/src/main/java/fiji/plugin/trackmate/util/cli/CLIUtils.java
index f6c1adf7c..a0b306cd5 100644
--- a/src/main/java/fiji/plugin/trackmate/util/cli/CLIUtils.java
+++ b/src/main/java/fiji/plugin/trackmate/util/cli/CLIUtils.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
diff --git a/src/main/java/fiji/plugin/trackmate/util/cli/CondaCLIConfigurator.java b/src/main/java/fiji/plugin/trackmate/util/cli/CondaCLIConfigurator.java
index 6fe52431d..fd465925e 100644
--- a/src/main/java/fiji/plugin/trackmate/util/cli/CondaCLIConfigurator.java
+++ b/src/main/java/fiji/plugin/trackmate/util/cli/CondaCLIConfigurator.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
diff --git a/src/main/java/fiji/plugin/trackmate/util/cli/CondaPathConfigCommand.java b/src/main/java/fiji/plugin/trackmate/util/cli/CondaPathConfigCommand.java
index dc044ad44..19de2a760 100644
--- a/src/main/java/fiji/plugin/trackmate/util/cli/CondaPathConfigCommand.java
+++ b/src/main/java/fiji/plugin/trackmate/util/cli/CondaPathConfigCommand.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.