diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 408ed86218..56389438bb 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -479,13 +479,16 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		//fixes issue when local files not shown after switching tabs
-		if (listAdapter.getGroupCount() == 0 &&
-				getDownloadActivity().getLocalIndexInfos().size() > 0){
+		//temporarily separate this if statement to identify NPE on soma installations
+		//if (listAdapter.getGroupCount() == 0 && getDownloadActivity().getLocalIndexInfos().size() > 0){
+		if (listAdapter.getGroupCount() == 0){
+		  if (getDownloadActivity().getLocalIndexInfos().size() > 0){
 			for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()){
 				listAdapter.addLocalIndexInfo(info);
 			}
 			listAdapter.sortData();
 			getExpandableListView().setAdapter(listAdapter);
+		  }
 		}
 		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
 		//hide action bar from downloadindexfragment