diff --git a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
index 7f12879f..21634639 100644
--- a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
@@ -277,7 +277,8 @@ public class FileSystemAdapter
 		@Override
 		public void onEvent(int event, String path)
 		{
-			mActivity.mPagerAdapter.postRequestRequery(FileSystemAdapter.this);
+			if (path != null) // Android bug? We seem to receive MOVE_SELF events
+				mActivity.mPagerAdapter.postRequestRequery(FileSystemAdapter.this);
 		}
 	}