2 files changed, 9 insertions, 5 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index c5acd1fd75..94953f098e 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -400,7 +400,7 @@ static int parse_viewportcolour(struct skin_element *element,
     }
     else
     {
-        if (!parse_color(param->data.text, &colour->colour))
+        if (!parse_color(curr_screen, param->data.text, &colour->colour))
             return -1;
     }
     colour->vp = &curr_vp->vp;
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 508446ab98..6ab016f88d 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -655,10 +655,14 @@ static void gwps_enter_wps(void)
 #if LCD_DEPTH > 1
         if (display->depth > 1)
         {
-            struct viewport *vp = &find_viewport(VP_DEFAULT_LABEL, 
-                                                 false, gwps->data)->vp;
-            vp->fg_pattern = display->get_foreground();
-            vp->bg_pattern = display->get_background();
+            struct skin_viewport *svp = find_viewport(VP_DEFAULT_LABEL, 
+                                                      false, gwps->data);
+            if (svp)
+            {
+                struct viewport *vp = &svp->vp;
+                vp->fg_pattern = display->get_foreground();
+                vp->bg_pattern = display->get_background();
+            }
         }
 #endif
         /* make the backdrop actually take effect */