diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
index 05e3297276..42e637651f 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
@@ -1606,7 +1606,8 @@ class ActivateDrawingStyle(bpy.types.Operator, Operator):
         active_drawing_style_index = scene.camera.data.BIMCameraProperties.active_drawing_style_index
 
         if active_drawing_style_index >= len(scene.DocProperties.drawing_styles):
-            return
+            self.report({"ERROR"}, "Could not find active drawing style")
+            return {"CANCELLED"}
 
         self.drawing_style = scene.DocProperties.drawing_styles[active_drawing_style_index]
 
diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py
index 71e9ec8c9b..91e2382425 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py
@@ -178,6 +178,9 @@ def update_schedule_name(self, context):
 
 def update_has_underlay(self, context):
     update_layer(self, context, "HasUnderlay", self.has_underlay)
+    if self.has_underlay:
+        bpy.ops.bim.reload_drawing_styles()
+        bpy.ops.bim.activate_drawing_style()
 
 
 def update_has_linework(self, context):