diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
index 1ffffe4..1c2d9b6 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/lifecycle/ServiceFinder.java
@@ -198,10 +198,14 @@ public class ServiceFinder {
int prevLen;
if (dir.isDirectory()) {
final File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++) {
+ if (files == null) {
+ return;
+ }
+
+ for (final File file : files) {
prevLen = relativePath.length();
- recursivelyListDir(dirListing, files[i],
- relativePath.append(prevLen == 0 ? "" : "/").append(files[i].getName()));
+ recursivelyListDir(dirListing, file,
+ relativePath.append(prevLen == 0 ? "" : "/").append(file.getName()));
relativePath.delete(prevLen, relativePath.length());
}
} else {
