diff --git a/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java b/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java
index 5fd3a6ca..4b2dc3ae 100644
--- a/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java
+++ b/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java
@@ -85,6 +85,10 @@ public class ContinuityFixer {
      * @param tsPacket The packet to fix.
      */
     public void fixContinuity(MTSPacket tsPacket) {
+        if(tsPacket == null) {
+            return;
+        }
+
         int pid = tsPacket.getPid();
         allPackets.put(pid, tsPacket);
         if (!firstPacketsOfCurrentSource.containsKey(pid)) {