- else if (keys[i].equals("image")) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
- else b.put(keys[i], vals[i]);
+ else if ("image".equals(keys[i])) b.put("image", resolveStringToResource((String)vals[i], xwt, true));
+ else if (keys[i] != null) b.put(keys[i], vals[i]);