1 files changed, 4 insertions, 2 deletions
diff --git a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java b/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java
index 0d6e5e3..5500279 100644
--- a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java
+++ b/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java
@@ -328,8 +328,10 @@ public class LayoutLibrary {
                 // Extended view info was requested but the layoutlib does not support it.
                 // Add it manually.
                 List<ViewInfo> infoList = session.getRootViews();
-                for (ViewInfo info : infoList) {
-                    addExtendedViewInfo(info);
+                if (infoList != null) {
+                    for (ViewInfo info : infoList) {
+                        addExtendedViewInfo(info);
+                    }
                 }
             }