diff --git a/bootstrap.xml b/bootstrap.xml
index 52b29aca855..695ce5f2e03 100644
--- a/bootstrap.xml
+++ b/bootstrap.xml
@@ -10,6 +10,7 @@
     <echoprop prop="os.version"/>
     <echoprop prop="os.arch"/>
     <echoprop prop="java.home"/>
+    <echoprop prop="java.vendor"/>
     <echoprop prop="java.version"/>
     <echoprop prop="user.name"/>
     <echoprop prop="user.home"/>
diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 4eeb1635dc3..991c3ced6a9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -73,8 +73,8 @@ public class DescriptorRenderer implements Renderer {
     }
 
     public String renderType(JetType type) {
-        if (type != null) {
-            return escape("<?>");
+        if (type == null) {
+            return escape("[NULL]");
         } else {
             return escape(type.toString());
         }