X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fclient%2Ffacade.py;h=5b7ac35fa6b7cf6d3d8eee9d06a9f9206a905855;hb=7291882b61e1482db38a9f37cc6a447439227d59;hp=9fc316095fe268054a9059d85734465219f7e4ee;hpb=40e869ca5f14b824c6ae4a7e2d23d940af25a492;p=osm%2FN2VC.git

diff --git a/juju/client/facade.py b/juju/client/facade.py
index 9fc3160..5b7ac35 100644
--- a/juju/client/facade.py
+++ b/juju/client/facade.py
@@ -232,8 +232,8 @@ class {}(Type):
                     else:
                         source.append("{}self.{} = {}".format(INDENT * 2, arg_name, arg_name))
                 elif type(arg_type) is typing.TypeVar:
-                    source.append("{}self.{} = {}.from_json({})".format(
-                        INDENT * 2, arg_name, arg_type_name, arg_name))
+                    source.append("{}self.{} = {}.from_json({}) if {} else None".format(
+                        INDENT * 2, arg_name, arg_type_name, arg_name, arg_name))
                 else:
                     source.append("{}self.{} = {}".format(INDENT * 2, arg_name, arg_name))