Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
===================================================================
diff -u -rdd967dbdbb68dc1e06b79f8af7a5acf93f202140 -r9fb08a83af0ced8577c646322d07754a9cd86674
--- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	(.../LoginRequestDispatcher.java)	(revision dd967dbdbb68dc1e06b79f8af7a5acf93f202140)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java	(.../LoginRequestDispatcher.java)	(revision 9fb08a83af0ced8577c646322d07754a9cd86674)
@@ -124,12 +124,20 @@
 			
 			String parameters = "";
 			
+			if (customCSV != null && extLmsId != null)
+			{
+				parameters += "&" + PARAM_CUSTOM_CSV + "=" + customCSV;
+				parameters += "&" + PARAM_EXT_LMS_ID + "=" + extLmsId;
+			}
+			else
+			{
+				log.error("Parameter customCSV not present");
+			}
+			
 			if (requestSrc != null && notifyCloseURL != null) {
 				try {
 					parameters = "&" + PARAM_REQUEST_SRC + "=" + URLEncoder.encode(requestSrc, "UTF8");
 					parameters += "&" + PARAM_NOTIFY_CLOSE_URL + "=" + URLEncoder.encode(notifyCloseURL, "UTF8");				
-					parameters += "&" + PARAM_CUSTOM_CSV + "=" + customCSV;
-					parameters += "&" + PARAM_EXT_LMS_ID + "=" + extLmsId;
 				} catch (UnsupportedEncodingException e) {
 					log.error(e);
 				}