diff --git a/framework/service/src/org/ofbiz/service/ServiceUtil.java b/framework/service/src/org/ofbiz/service/ServiceUtil.java
index f5efc16f7ad..8c0c3766fc3 100644
--- a/framework/service/src/org/ofbiz/service/ServiceUtil.java
+++ b/framework/service/src/org/ofbiz/service/ServiceUtil.java
@@ -468,7 +468,7 @@ public static Map<String, Object> purgeOldJobs(DispatchContext dctx, Map<String,
                     noMoreResults = true;
                 }
             }
-            
+
             // Now JobSandbox data is cleaned up. Now process Runtime data and remove the whole data in single shot that is of no need.
             boolean beganTx3 = false;
             GenericValue runtimeData = null;
@@ -478,7 +478,7 @@ public static Map<String, Object> purgeOldJobs(DispatchContext dctx, Map<String,
             try {
                 // begin this transaction
                 beganTx3 = TransactionUtil.begin();
-                
+
                 runTimeDataIt = delegator.find("RuntimeData", null, null, UtilMisc.toSet("runtimeDataId"), null, null);
                 try {
                     while ((runtimeData = runTimeDataIt.next()) != null) {
@@ -701,9 +701,10 @@ public static Map<String, Object> resetJob(DispatchContext dctx, Map<String, Obj
      * @param timeZone
      * @param locale
      * @return filled Map or null on error
+     * @throws GeneralServiceException
      */
     public static Map<String, Object> setServiceFields(LocalDispatcher dispatcher, String serviceName, Map<String, Object> fromMap, GenericValue userLogin,
-            TimeZone timeZone, Locale locale) {
+            TimeZone timeZone, Locale locale) throws GeneralServiceException {
         Map<String, Object> outMap = FastMap.newInstance();
 
         ModelService modelService = null;
@@ -712,7 +713,7 @@ public static Map<String, Object> setServiceFields(LocalDispatcher dispatcher, S
         } catch (GenericServiceException e) {
             String errMsg = "Could not get service definition for service name [" + serviceName + "]: ";
             Debug.logError(e, errMsg, module);
-            return null;
+            throw new GeneralServiceException(e);
         }
         outMap.putAll(modelService.makeValid(fromMap, "IN", true, null, timeZone, locale));