Catch some possible crashes

2 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/se/lublin/humla/net/HumlaConnection.java b/src/main/java/se/lublin/humla/net/HumlaConnection.java
index 15e007c..57ff570 100644
--- a/src/main/java/se/lublin/humla/net/HumlaConnection.java
+++ b/src/main/java/se/lublin/humla/net/HumlaConnection.java
@@ -46,6 +46,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -136,7 +137,11 @@ public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP
             }
 
             // Start TCP/UDP ping thread. FIXME is this the right place?
-            mPingTask = mPingExecutorService.scheduleAtFixedRate(mPingRunnable, 0, 5, TimeUnit.SECONDS);
+            try {
+                mPingTask = mPingExecutorService.scheduleAtFixedRate(mPingRunnable, 0, 5, TimeUnit.SECONDS);
+            } catch(RejectedExecutionException e) {
+                Log.w(Constants.TAG, "HumlaConnection fail to start ping thread, in \"shutdown\"? ", e);
+            }
 
             mSession = msg.getSession();
             mMaxBandwidth = msg.hasMaxBandwidth() ? msg.getMaxBandwidth() : -1;
diff --git a/src/main/java/se/lublin/humla/protocol/AudioHandler.java b/src/main/java/se/lublin/humla/protocol/AudioHandler.java
index 3d6268c..716211b 100644
--- a/src/main/java/se/lublin/humla/protocol/AudioHandler.java
+++ b/src/main/java/se/lublin/humla/protocol/AudioHandler.java
@@ -206,6 +206,11 @@ public class AudioHandler extends HumlaNetworkListener implements AudioInput.Aud
             mEncoder = null;
         }
 
+        if (codec == null) {
+            Log.w(Constants.TAG, "AudioHandler setCodec(null) Input disabled.");
+            return;
+        }
+
         IEncoder encoder;
         switch (codec) {
             case UDPVoiceCELTAlpha: