X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fshader-effects%2Fshader-effect-wrapper.cpp;h=89f4ebe803d56e3664877eba86b1ca1ac4094f4b;hb=235c866c63c1b2b493a5bff0508fa92cb70a9f2e;hp=04ae5fa049fadc856674842f68c699283d9bf3fa;hpb=4c85a797e24c20bfb1670c079e5f66a9a5d6fa0e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/plugins/dali-script-v8/src/shader-effects/shader-effect-wrapper.cpp b/plugins/dali-script-v8/src/shader-effects/shader-effect-wrapper.cpp
index 04ae5fa..89f4ebe 100644
--- a/plugins/dali-script-v8/src/shader-effects/shader-effect-wrapper.cpp
+++ b/plugins/dali-script-v8/src/shader-effects/shader-effect-wrapper.cpp
@@ -126,8 +126,11 @@ void ShaderEffectWrapper::NewShaderEffect( const v8::FunctionCallbackInfo< v8::V
   }
   Dali::ShaderEffect shaderEffect = ShaderEffectApi::New( isolate, args );
 
-  v8::Local<v8::Object> localObject = WrapShaderEffect( isolate, shaderEffect );
-  args.GetReturnValue().Set( localObject );
+  if(shaderEffect)
+  {
+    v8::Local<v8::Object> localObject = WrapShaderEffect( isolate, shaderEffect );
+    args.GetReturnValue().Set( localObject );
+  }
 }