diff --git a/co-simulation/fed/mosaic-carla/src/main/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassador.java b/co-simulation/fed/mosaic-carla/src/main/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassador.java
index 82ab05d6..84521d96 100644
--- a/co-simulation/fed/mosaic-carla/src/main/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassador.java
+++ b/co-simulation/fed/mosaic-carla/src/main/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassador.java
@@ -380,16 +380,17 @@ public synchronized void processTimeAdvanceGrant(long time) throws InternalFeder
             for (DetectedObjectInteraction detectionInteraction: detectedObjectInteractions) {
                 this.rti.triggerInteraction(detectionInteraction);
             }
-        } catch (IllegalValueException e) {
-            log.error("Error during advanceTime(" + time + ")", e);
+        } 
+        catch (IllegalValueException e) {
+            log.error("Failed to process advance time grant due to : ", e);
         }
         catch (XmlRpcException e ) {
             throw new InternalFederateException("Failed to process advance time grant due to CARLA CDA Sim "
                         + "Adapter connection! Check carla_config.json!", e);
         }
         catch (InterruptedException e) {
-            throw new InternalFederateException("Failed to process advance time grant due to CARLA CDA Sim "
-                        + "Adapter connection! Check carla_config.json!", e);
+            log.error("Failed to process advance time grant due to failed thread sleep!", e);
+            Thread.currentThread().interrupt();
         }
     }
 
@@ -419,6 +420,7 @@ public void finishSimulation() throws InternalFederateException {
                 connectionProcess.waitFor(10, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 log.warn("Something went wrong when stopping a process", e);
+                Thread.currentThread().interrupt();
             } finally {
                 connectionProcess.destroy();
             }
diff --git a/co-simulation/fed/mosaic-carla/src/test/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassadorTest.java b/co-simulation/fed/mosaic-carla/src/test/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassadorTest.java
index 4e0e6de7..5a80d673 100644
--- a/co-simulation/fed/mosaic-carla/src/test/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassadorTest.java
+++ b/co-simulation/fed/mosaic-carla/src/test/java/org/eclipse/mosaic/fed/carla/ambassador/CarlaAmbassadorTest.java
@@ -213,8 +213,6 @@ public void processDetectorRegistrationInteractionException() throws XmlRpcExcep
         ambassador.processInteraction(registration);
 
         verify(carlaXmlRpcClientMock, times(1)).createSensor(registration);
-
-
     }