diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf
index b0e4dcb7..5e884262 100644
--- a/examples/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/restbucksCRUD/restbucks-safe.ecf
@@ -25,7 +25,7 @@
 		<library name="json" location="..\..\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="uri_template" location="../../library/text/parser/uri_template/uri_template-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
-		<library name="wsf_extension" location="..\..\library\server\wsf_extension\wsf_extension-safe.ecf" readonly="false"/>
+		<library name="wsf_extension" location="..\..\library\server\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 </system>
diff --git a/examples/restbucksCRUD/src/domain/json_order_converter.e b/examples/restbucksCRUD/src/domain/json_order_converter.e
index 31e41757..634628da 100644
--- a/examples/restbucksCRUD/src/domain/json_order_converter.e
+++ b/examples/restbucksCRUD/src/domain/json_order_converter.e
@@ -34,9 +34,15 @@ feature -- Conversion
         do
             is_valid_from_json := True
 
-            s_id   ?= json.object (j.item (id_key), Void)
-            s_location ?= json.object (j.item (location_key), Void)
-            s_status ?= json.object (j.item (status_key), Void)
+			if attached {STRING_32} json.object (j.item (id_key), Void) as l_id then
+				s_id := s_id
+			end
+			if attached {STRING_32} json.object (j.item (location_key), Void) as l_location then
+				s_location := l_location
+			end
+			if attached {STRING_32} json.object (j.item (status_key), Void) as l_status then
+				s_status := l_status
+			end
 
          	create o.make ("", s_location, s_status)