- properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
- properties.put(WebClient.HEAD_HTML, theme.getAdditionalHeaders());
+ if (theme != null) {
+ properties.put(WebClient.THEME_ID, theme.getThemeId());
+ properties.put(WebClient.HEAD_HTML, theme.getAdditionalHeaders());
+ } else {
+ properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
+ }