diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart
index eea5d244..434f8de7 100644
--- a/lib/models/service_request/service_request.dart
+++ b/lib/models/service_request/service_request.dart
@@ -99,16 +99,20 @@ class ServiceRequest{
       engineerName: parsedJson["assignedEmployee"] == null ? null :
       parsedJson["assignedEmployee"]["name"],
       hospitalId: parsedJson["asset"]["site"]["id"],
-      reportID: parsedJson["workOrder"]["workOrderId"],
+      reportID: parsedJson["workOrder"] != null ?
+      parsedJson["workOrder"]["workOrderId"] : null,
       viewReport: parsedJson["workOrder"] != null,
       deviceModel: parsedJson["asset"]["modelDefinition"]["modelName"],
       engineerMobile: parsedJson["assignedEmployee"] == null ? null :
       parsedJson["assignedEmployee"]["phone"],
-      faultDescription: parsedJson["workOrder"]["faultDescription"],
-      jobSheetNumber: parsedJson["workOrder"]["jobSheetNumber"],
+      faultDescription: parsedJson["workOrder"] != null ?
+      parsedJson["workOrder"]["faultDescription"] : null,
+      jobSheetNumber: parsedJson["workOrder"] != null ?
+      parsedJson["workOrder"]["jobSheetNumber"] :null,
       visitDate: DateTime.tryParse(parsedJson["visitDate"] ?? "").toString().split(" ").first,
       nextVisitDate: DateTime.tryParse(parsedJson["nextVisitDate"] ?? ""),
-      workPerformed: parsedJson["workOrder"]["workPerformed"],
+      workPerformed: parsedJson["workOrder"] != null ?
+      parsedJson["workOrder"]["workPerformed"] : null,
       device: Device.fromJson(parsedJson["asset"])
     );
   }
diff --git a/lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart
index 30c9310a..cd55f5b2 100644
--- a/lib/views/pages/device_transfer/request_device_transfer.dart
+++ b/lib/views/pages/device_transfer/request_device_transfer.dart
@@ -57,7 +57,7 @@ class _RequestDeviceTransferState extends State<RequestDeviceTransfer> {
 
     _isLoading = true;
     setState(() {});
-    _formModel.sender.client.id = _userProvider.user.hospital?.id;
+    _formModel.sender?.client?.id = _userProvider.user?.hospital?.id;
     int status = await _deviceTransferProvider.createRequest(
       user: _userProvider.user,
       host: _settingProvider.host,
diff --git a/pubspec.yaml b/pubspec.yaml
index 6cf0797c..dd4f5b99 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.7.4+1
+version: 1.0.0+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"