diff --git a/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java b/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java
index f6f5bc88cb..122527de2b 100644
--- a/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java
+++ b/dependencyLibs/Core/src/org/droidplanner/core/MAVLink/connection/MavLinkConnection.java
@@ -7,7 +7,6 @@
 import org.droidplanner.core.util.Pair;
 
 import java.io.BufferedOutputStream;
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -229,7 +228,8 @@ public void run() {
                 for (Pair<String, BufferedOutputStream> entry : loggingOutStreams.values()) {
                     final String loggingFilePath = entry.first;
                     try {
-                        entry.second.close();
+                        if (entry.second != null)
+                            entry.second.close();
                     } catch (IOException e) {
                         mLogger.logErr(TAG, "IO Exception while closing " + loggingFilePath, e);
                     }
diff --git a/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java b/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java
index 913cb6c39d..efc15dfc26 100644
--- a/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java
+++ b/dependencyLibs/Core/src/org/droidplanner/core/drone/variables/GuidedPoint.java
@@ -64,7 +64,7 @@ public static boolean isGuidedMode(Drone drone){
         }
 
         if(Type.isRover(droneType)){
-            return droneMode == ApmModes.ROVER_GUIDED;
+            return droneMode == ApmModes.ROVER_GUIDED || droneMode == ApmModes.ROVER_HOLD;
         }
 
         return false;