X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fexternal_objects_java%2Fsci_gateway%2Fcpp%2Fsci_jautoUnwrap.cpp;h=0202cae08c8609fabf868f18413f5878df09dcdd;hp=1d6e29627aa8e3d5b5fa344b03afdf250a3142f1;hb=382fb7db52b6296f898e317e7b9e10ab00f5aed3;hpb=4aec26a6775ef46af86e1894996a9f5bf831780e

diff --git a/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jautoUnwrap.cpp b/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jautoUnwrap.cpp
index 1d6e296..0202cae 100644
--- a/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jautoUnwrap.cpp
+++ b/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jautoUnwrap.cpp
@@ -27,7 +27,14 @@ int sci_jautoUnwrap(char * fname, unsigned long fname_len)
     try
     {
         const int envId = ScilabJavaEnvironment::start();
-        JavaOptionsSetter setter = ScilabJavaEnvironment::getInstance().getOptionsHelper().getSetter(JavaOptionsSetter::AUTOUNWRAP);
+        ScilabJavaEnvironment *javaEnvironment = ScilabJavaEnvironment::getInstance();
+        if (!javaEnvironment)
+        {
+            Scierror(999, "%s: No Java environment available (instance is null).", fname);
+            return 0;
+        }
+
+        JavaOptionsSetter setter = javaEnvironment->getOptionsHelper().getSetter(JavaOptionsSetter::AUTOUNWRAP);
         return ScilabGateway::getsetOptions(fname, envId, setter, pvApiCtx);
     }
     catch (std::exception & e)