From b8d0b13ccff16586fcafcced4687d05332d5a50f Mon Sep 17 00:00:00 2001
From: Fredrik Osterlind <fredrik@thingsquare.com>
Date: Thu, 7 Aug 2014 11:41:44 +0200
Subject: [PATCH] improved debugging output at referenceVar errors

---
 .../java/org/contikios/cooja/contikimote/ContikiMoteType.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
index 8256f0580..c80c375b1 100644
--- a/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
+++ b/tools/cooja/java/org/contikios/cooja/contikimote/ContikiMoteType.java
@@ -491,7 +491,9 @@ public class ContikiMoteType implements MoteType {
         int referenceVar = (int) varMem.getVariable("referenceVar").addr;
         myCoreComm.setReferenceAddress(referenceVar);
       } catch (UnknownVariableException e) {
-        throw new MoteTypeCreationException("JNI call error: " + e.getMessage(), e);
+        throw new MoteTypeCreationException("Error setting reference variable: " + e.getMessage(), e);
+      } catch (RuntimeException e) {
+          throw new MoteTypeCreationException("Error setting reference variable: " + e.getMessage(), e);
       }
 
       getCoreMemory(tmp);