1 files changed, 13 insertions, 9 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index c35b09eaac..4a3dcc2177 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -390,16 +390,20 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
     while (list)
     {
         struct wps_token *token = SKINOFFSETTOPTR(get_skin_buffer(data), list->token);
-        struct gui_img *img = (struct gui_img*)SKINOFFSETTOPTR(get_skin_buffer(data), token->value.data);
-        if (img->using_preloaded_icons && img->display >= 0)
-        {
-            screen_put_icon(display, img->x, img->y, img->display);
-        }
-        else if (img->loaded)
-        {
-            if (img->display >= 0)
+        struct gui_img *img = NULL;
+        if (token)
+            img = (struct gui_img*)SKINOFFSETTOPTR(get_skin_buffer(data), token->value.data);
+        if (img) {
+            if (img->using_preloaded_icons && img->display >= 0)
             {
-                wps_draw_image(gwps, img, img->display, vp);
+                screen_put_icon(display, img->x, img->y, img->display);
+            }
+            else if (img->loaded)
+            {
+                if (img->display >= 0)
+                {
+                    wps_draw_image(gwps, img, img->display, vp);
+                }
             }
         }
         list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next);