diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
index 7aa0fe228..c55ef47bb 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMoteType.java,v 1.37 2010/10/04 22:33:58 nifi Exp $
+ * $Id: MspMoteType.java,v 1.38 2010/10/25 14:13:38 nifi Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -400,6 +400,10 @@ public abstract class MspMoteType implements MoteType {
 
     /* Fetch all executable addresses */
     ArrayList<Integer> addresses = elf.getDebug().getExecutableAddresses();
+    if (addresses == null) {
+      // No debug information is available
+      return fileToLineHash;
+    }
 
     for (int address: addresses) {
       DebugInfo info = elf.getDebugInfo(address);