Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 5222)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 5223)
@@ -151,5 +151,5 @@
 
         // update selection to reflect which way being modified
-        if (currentBaseNode != null && getCurrentDataSet().getSelected().isEmpty() == false) {
+        if (currentBaseNode != null && getCurrentDataSet() != null && getCurrentDataSet().getSelected().isEmpty() == false) {
             Way continueFrom = getWayForNode(currentBaseNode);
             if (alt && continueFrom != null && (!currentBaseNode.isSelected() || continueFrom.isSelected())) {