fixed rendering issues with user info view

openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java

@@ -76,6 +76,7 @@ public class JSONUserInfoView extends AbstractView{
 		obj.addProperty("nickname", ui.getNickname());
 		obj.addProperty("profile", ui.getProfile());
 		obj.addProperty("picture", ui.getPicture());
+		obj.addProperty("email", ui.getEmail());
 		obj.addProperty("website", ui.getWebsite());
 		obj.addProperty("verified", ui.getVerified());
 		obj.addProperty("gender", ui.getGender());
@@ -84,6 +85,7 @@ public class JSONUserInfoView extends AbstractView{
 		obj.addProperty("phone_number", ui.getPhoneNumber());
 		obj.addProperty("updated_time", ui.getUpdatedTime());
 		
+		if (ui.getAddress() != null) {
 			JsonObject addr = new JsonObject();
 			addr.addProperty("formatted", ui.getAddress().getFormatted());
 			addr.addProperty("street_address", ui.getAddress().getStreetAddress());
@@ -93,6 +95,7 @@ public class JSONUserInfoView extends AbstractView{
 			addr.addProperty("country", ui.getAddress().getCountry());
 		
 			obj.add("address", addr);
+		}	
 		
 		return obj;
 	}