diff --git a/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java b/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java
index 74f17aaa88d8..a002f1a86ca5 100644
--- a/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java
+++ b/plugins/android/src/org/jetbrains/android/uipreview/LayoutDeviceConfigurationsDialog.java
@@ -58,9 +58,11 @@ public class LayoutDeviceConfigurationsDialog extends DialogWrapper {
 
     myProject = project;
     myLayoutDeviceManager = layoutDeviceManager;
-    
-    mySelectedDeviceConfigName = selectedConfig.getName();
-    mySelectedDeviceName = selectedConfig.getDevice().getName();
+
+    if (selectedConfig != null) {
+      mySelectedDeviceConfigName = selectedConfig.getName();
+      mySelectedDeviceName = selectedConfig.getDevice().getName();
+    }
 
     setTitle(AndroidBundle.message("android.layout.preview.device.configurations.dialog.title"));