diff --git a/.openshift/cron/daily/log-cleanup.sh b/.openshift/cron/daily/log-cleanup.sh
index d16a285d..ce79496f 100755
--- a/.openshift/cron/daily/log-cleanup.sh
+++ b/.openshift/cron/daily/log-cleanup.sh
@@ -1 +1,7 @@
-rm -rf $OPENSHIFT_JBOSSAS_LOG_DIR/*.log.*
\ No newline at end of file
+if [ $OPENSHIFT_JBOSSAS_LOG_DIR ]; then
+	rm -rf $OPENSHIFT_JBOSSAS_LOG_DIR/*.log.*
+fi
+
+if [ $OPENSHIFT_JBOSSEAP_LOG_DIR ]; then
+	rm -rf $OPENSHIFT_JBOSSEAP_LOG_DIR/*.log.*
+fi
\ No newline at end of file