diff --git a/src/in/celest/xash3d/FPicker.java b/src/in/celest/xash3d/FPicker.java
index ba8ea884..a2c44730 100644
--- a/src/in/celest/xash3d/FPicker.java
+++ b/src/in/celest/xash3d/FPicker.java
@@ -81,11 +81,11 @@ public class FPicker extends Activity {
 
 			while( dirs == null )
 			{
-				try {
-					folder = new File(folder.getParent());
-				} catch (NullPointerException e) {
+				String parent = folder.getParent();
+				if (parent != null)
+					folder = new File(parent);
+				else
 					folder = new File(Environment.getExternalStorageDirectory().toString());
-				}
 				dirs = folder.listFiles();
 			}