EDMI: Small Changes

Service.EDMIService/EDMIService.vb

@@ -526,10 +526,22 @@ Public Class EDMIService
                 EXEC PRIDB_NEW_OBJECT '{Data.KindType}','{Data.Who}','{Data.BusinessEntity}',0, @IDB_OBJ_ID = @NEW_IDB_OBJ_ID OUTPUT;
                 SELECT @NEW_IDB_OBJ_ID"
             Dim oObjectId = MSSQL_IDB.GetScalarValue(oSQL)
+
+            If oObjectId Is Nothing Then
+                Dim oDetails As New UnexpectedErrorFault(New Exception("NewObjectId: Could not create new ObjectId!"))
+                Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            End If
+
             Return New NewObjectIdResponse With {.ObjectId = oObjectId}
+        Catch ex As FaultException
+            _Logger.Error(ex)
+            Throw ex
+
         Catch ex As Exception
             _Logger.Error(ex)
-            Return New NewObjectIdResponse With {.ObjectId = 0}
+            Dim oDetails As New UnexpectedErrorFault(ex)
+            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+
         End Try
     End Function
 
@@ -615,7 +627,7 @@ Public Class EDMIService
         Dim oObjectStore
         If pStoreType = ClassConstants.FileStoreArchive Then
             oObjectStore = GlobalState.ObjectStores.Item(0)
-        Else 'pStoreType = ClassConstants.FileStoreWork
+        Else ' pStoreType = ClassConstants.FileStoreWork Then
             oObjectStore = GlobalState.ObjectStores.Item(1)
         End If
         _Logger.Debug($"oObjectStore is [{oObjectStore.Path}]")