diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor
index 55422c8b..3cb897b1 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor
@@ -1,9 +1,12 @@
@*This class is view part of RenderableContentControl. It contains UI generation pipeline.*@
@*Call rendering method over context object*@
-
- @RenderComponent(_context)
-
+@if (Context != null)
+{
+
+ @RenderComponent(Context)
+
+}
@@ -11,6 +14,9 @@
{
private RenderFragment RenderComponent(ITwinElement element) => __builder =>
{
+ if (element == null)
+ return;
+
// if it is primitive type, just generate
if (element is ITwinPrimitive)
{
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor.cs b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor.cs
index b9a4a3e6..20f5f58d 100644
--- a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor.cs
+++ b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor.cs
@@ -19,8 +19,10 @@
using AXSharp.Presentation.Blazor.Exceptions;
using System.Reflection;
using System.ComponentModel;
+using System.Globalization;
using AXSharp.Connector.ValueTypes;
using System.Xml.Linq;
+using AXSharp.Connector.Localizations;
namespace AXSharp.Presentation.Blazor.Controls.RenderableContent
{
@@ -42,7 +44,7 @@ public partial class RenderableContentControl : ComponentBase, IDisposable
/// Parameter Context accept ITwinElement instance, which is used as base model for UI generation.
///
[Parameter]
- public object Context
+ public ITwinElement Context
{
get => _context;
set
@@ -83,6 +85,14 @@ public string Presentation
///
[Parameter]
public string LayoutClass { get; set; }
+
+ ///