diff --git a/OsmAnd/src/com/bidforfix/andorid/BidForFixActivity.java b/OsmAnd/src/com/bidforfix/andorid/BidForFixActivity.java
index 69b4bbf1a4..509e7fd62d 100644
--- a/OsmAnd/src/com/bidforfix/andorid/BidForFixActivity.java
+++ b/OsmAnd/src/com/bidforfix/andorid/BidForFixActivity.java
@@ -114,7 +114,7 @@ public abstract class BidForFixActivity extends ListActivity {
 			super.onPostExecute(result);
 			//set the adapter (clear,set)
 			setListAdapter(new BFFIssueArrayAdapter(BidForFixActivity.this, getHelper().getList()));
-			dismissDialog(LOAD_ITEMS);
+			dialog.dismiss();
 		}
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java b/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
index a5379f8d03..4b2d5fbbf5 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
@@ -602,7 +602,10 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
 				mainView.setKeepScreenOn(false);
 			}
 			updateLoadedFiles();
-			((DownloadIndexAdapter) getExpandableListAdapter()).notifyDataSetInvalidated();
+			DownloadIndexAdapter adapter = ((DownloadIndexAdapter) getExpandableListAdapter());
+			if (adapter != null) {
+				adapter.notifyDataSetInvalidated();
+			}
 		}
 		
 		@Override