Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java	(revision 23848)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java	(revision 23849)
@@ -204,4 +204,28 @@
 		return tags;
 	}
+	
+	/**
+	 * Gets the number of streets in the container.
+	 * @return
+	 */
+	public int getNumberOfStreets() {
+		return streetDict != null ? streetDict.size() : 0;
+	}
+	
+	/**
+	 * Get the number of incomplete addresses.
+	 * @return
+	 */
+	public int getNumberOfIncompleteAddresses() {
+		return incompleteAddresses != null ? incompleteAddresses.size() : 0;
+	}
+	
+	/**
+	 * Gets the number of unresolved addresses.
+	 * @return
+	 */
+	public int getNumberOfUnresolvedAddresses() {
+		return unresolvedAddresses != null ? unresolvedAddresses.size() : 0;
+	}
 
 	/**
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java	(revision 23848)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditSelectionEvent.java	(revision 23849)
@@ -86,5 +86,5 @@
 			int selRows = streetTable.getSelectedRow();
 			
-			if (selRows < 0 || selRows >= addressContainer.getStreetList().size()) {
+			if (selRows < 0 || selRows >= addressContainer.getNumberOfStreets()) {
 				return null;
 			}
@@ -108,5 +108,5 @@
 			List<AddressNode> nodes = new ArrayList<AddressNode>();
 			for (int i = 0; i < selRows.length; i++) {
-				if (i >= 0 && i < addressContainer.getIncompleteAddresses().size()) {
+				if (i >= 0 && i < addressContainer.getNumberOfIncompleteAddresses()) {
 					nodes.add(addressContainer.getIncompleteAddresses().get(selRows[i]));
 				}
@@ -130,5 +130,5 @@
 			List<AddressNode> nodes = new ArrayList<AddressNode>();
 			for (int i = 0; i < selRows.length; i++) {
-				if (i >= 0 && i < addressContainer.getUnresolvedAddresses().size()) {
+				if (i >= 0 && i < addressContainer.getNumberOfUnresolvedAddresses()) {
 					nodes.add(addressContainer.getUnresolvedAddresses().get(selRows[i]));
 				}
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/IncompleteAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/IncompleteAddressesTableModel.java	(revision 23848)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/IncompleteAddressesTableModel.java	(revision 23849)
@@ -54,5 +54,5 @@
 			return 0;
 		}
-		return addressContainer.getIncompleteAddresses().size();
+		return addressContainer.getNumberOfIncompleteAddresses();
 	}
 
@@ -62,5 +62,5 @@
 			return null;
 		}
-		if (row < 0 || row > addressContainer.getIncompleteAddresses().size()) {
+		if (row < 0 || row > addressContainer.getNumberOfIncompleteAddresses()) {
 			return null;
 		}
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/StreetTableModel.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/StreetTableModel.java	(revision 23848)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/StreetTableModel.java	(revision 23849)
@@ -70,5 +70,5 @@
 			return 0;
 		}
-		return addressContainer.getStreetList().size();
+		return addressContainer.getNumberOfStreets();
 	}
 
@@ -81,5 +81,5 @@
 			return null;
 		}
-		if (row < 0 || row > addressContainer.getStreetList().size()) {
+		if (row < 0 || row > addressContainer.getNumberOfStreets()) {
 			return null;
 		}
Index: /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java
===================================================================
--- /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java	(revision 23848)
+++ /applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java	(revision 23849)
@@ -74,5 +74,5 @@
 			return 0;
 		}
-		return addressContainer.getUnresolvedAddresses().size();
+		return addressContainer.getNumberOfUnresolvedAddresses();
 	}
 
@@ -82,5 +82,5 @@
 			return null;
 		}
-		if (row < 0 || row > addressContainer.getUnresolvedAddresses().size()) {
+		if (row < 0 || row > addressContainer.getNumberOfUnresolvedAddresses()) {
 			return null;
 		}