diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..c443b150e2f89757002a9b4a7b37de103acb6f71
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+### Set the default behavior for text files (lineendings will be converted by git) 
+* text=auto 
+
+### Declare files that will always have CRLF line endings on checkout (Example: windows bat file) 
+*.bat        text eol=crlf 
+
+### Declare files that will always have LF line endings on checkout. (Example: linux .sh script) 
+*.sh        text eol=lf 
+
+### Denote all files that are truly binary and should not be modified. 
+*.png        binary 
+*.jpg        binary 
+*.jasper        binary 
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js b/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js
index 6837f0bb734737098946439ce2a25413d5550e31..b8df733c9a7834ae6eb89504ea900f9c2e57fec9 100644
--- a/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js
@@ -6,7 +6,7 @@ var links = [];
 
 var orgId = vars.get("$field.ORGANISATION_ID")
 if (orgId && orgId.trim() != "0")
-    links.push(["Organisation", vars.get("$field.ORGANISATION_ID")]);
+    links.push(["Organisation", vars.get("$field.ORGANISATION_CONTACTID")]);
 
 links = JSON.stringify(links);
 result.string(links);
\ No newline at end of file
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 8976e941145178f890c0e7deae0eb4f7b3835fd8..877b1cf2c01a0afdd1eee2483cf2b94fc9bd249b 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -86,6 +86,8 @@ ContextUtils.getContextConsumer = function(pContextId)
             return "CampaignSteps";
         case ContextUtils.getContextName("PrivatePerson"):
             return "PrivatePersons";
+        default:
+            throw new Error(translate.withArguments("No consumer found for context '%0'", [pContextId]));
     }
 }