diff --git a/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/dao/impl/ApplicationDataDirectoryImpl.java b/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/dao/impl/ApplicationDataDirectoryImpl.java
index 5ddc3fbda..c29fefce6 100644
--- a/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/dao/impl/ApplicationDataDirectoryImpl.java
+++ b/bahmnicore-api/src/main/java/org/bahmni/module/bahmnicore/dao/impl/ApplicationDataDirectoryImpl.java
@@ -9,7 +9,11 @@ public class ApplicationDataDirectoryImpl implements ApplicationDataDirectory {
 
     @Override
     public File getFile(String relativePath) {
-        return new File(OpenmrsUtil.getApplicationDataDirectory() + relativePath);
+        String applicationDataDirectory = OpenmrsUtil.getApplicationDataDirectory();
+        if (!applicationDataDirectory.endsWith(File.separator)) {
+            applicationDataDirectory += File.separator;
+        }
+        return new File(applicationDataDirectory + relativePath);
     }
 
     @Override
diff --git a/openmrs-elis-atomfeed-client-omod/src/main/java/org/bahmni/module/elisatomfeedclient/api/worker/OpenElisAccessionEventWorker.java b/openmrs-elis-atomfeed-client-omod/src/main/java/org/bahmni/module/elisatomfeedclient/api/worker/OpenElisAccessionEventWorker.java
index 8b375970e..0f35f094d 100644
--- a/openmrs-elis-atomfeed-client-omod/src/main/java/org/bahmni/module/elisatomfeedclient/api/worker/OpenElisAccessionEventWorker.java
+++ b/openmrs-elis-atomfeed-client-omod/src/main/java/org/bahmni/module/elisatomfeedclient/api/worker/OpenElisAccessionEventWorker.java
@@ -143,7 +143,11 @@ public void process(Event event) {
 
     void runInterceptor(Class className, Object object) {
         GroovyClassLoader gcl = new GroovyClassLoader();
-        File directory = new File(OpenmrsUtil.getApplicationDataDirectory() + "elisFeedInterceptor");
+        String applicationDataDirectory = OpenmrsUtil.getApplicationDataDirectory();
+        if (!applicationDataDirectory.endsWith(File.separator)) {
+            applicationDataDirectory += File.separator;
+        }
+        File directory = new File(applicationDataDirectory + "elisFeedInterceptor");
         File[] files = directory.listFiles();
         if (files != null) {
             for (File file : files) {