diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj
index aa99be70..8ffaec39 100644
--- a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj
+++ b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj
@@ -12,9 +12,9 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<RootNamespace>Maui.FreakyControls</RootNamespace>
-		<AssemblyVersion>0.4.3</AssemblyVersion>
-		<AssemblyFileVersion>0.4.3</AssemblyFileVersion>
-		<Version>0.4.3</Version>
+		<AssemblyVersion>0.4.4</AssemblyVersion>
+		<AssemblyFileVersion>0.4.4</AssemblyFileVersion>
+		<Version>0.4.4</Version>
 		<NeutralLanguage>en</NeutralLanguage>
 		<!--Version of C# to use -->
 		<PackageId>FreakyControls</PackageId>
@@ -27,8 +27,8 @@
 		<PackageProjectUrl>https://github.com/FreakyAli/MAUI.FreakyControls</PackageProjectUrl>
 		<RepositoryType>
 		</RepositoryType>
-		<PackageTags>Maui dotnet.Maui .net-Maui FreakyControls Checkbox uikit Signature Radiobutton SignatureView Svg SvgImageView CircularImage TextInputLayout</PackageTags>
-		<PackageReleaseNotes>Say Hello to RadioButtons and RadioButtonGroup</PackageReleaseNotes>
+		<PackageTags>Maui dotnet.Maui .net-Maui FreakyControls Button Checkbox uikit Signature Radiobutton SignatureView Svg SvgImageView CircularImage TextInputLayout</PackageTags>
+		<PackageReleaseNotes>FreakyButton is here!</PackageReleaseNotes>
 		<Copyright>Copyright 2023</Copyright>
 		<PackOnBuild>true</PackOnBuild>
 		<SynchReleaseVersion>false</SynchReleaseVersion>
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyDatePicker/FreakyDatePickerHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyDatePicker/FreakyDatePickerHandler.cs
index b557c6ba..4df9f41f 100644
--- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyDatePicker/FreakyDatePickerHandler.cs
+++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyDatePicker/FreakyDatePickerHandler.cs
@@ -17,9 +17,12 @@ private void MapDatePicker(IDatePickerHandler datePickerHandler, IDatePicker dat
         if (datePicker is FreakyDatePicker freakyDatePicker &&
             datePickerHandler is FreakyDatePickerHandler freakyDatePickerHandler)
         {
-            if (freakyDatePicker.ImageSource != default(ImageSource))
+            if (PlatformView != null && VirtualView != null)
             {
-                freakyDatePickerHandler.HandleAndAlignImageSourceAsync(freakyDatePicker).RunConcurrently() ;
+                if (freakyDatePicker.ImageSource != default(ImageSource))
+                {
+                    freakyDatePickerHandler.HandleAndAlignImageSourceAsync(freakyDatePicker).RunConcurrently();
+                }
             }
         }
     }
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditorHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditorHandler.cs
index 2581ede0..b6cd8c88 100644
--- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditorHandler.cs
+++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEditor/FreakyEditorHandler.cs
@@ -13,8 +13,11 @@ public FreakyEditorHandler()
     private void MapFreakyEditor(IEditorHandler editorHandler, IEditor editor)
     {
         if (editor is FreakyEditor feditor && editorHandler is FreakyEditorHandler freakyEditorHandler)
-        {
-            HandleAllowCopyPaste(feditor);
+        {
+            if (PlatformView != null && VirtualView != null)
+            {
+                HandleAllowCopyPaste(feditor);
+            }
         }
     }
 }
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs
index 8046f75d..733672e3 100644
--- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs
+++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyEntry/FreakyEntryHandler.cs
@@ -17,13 +17,16 @@ public FreakyEntryHandler()
     private void MapFreakyEntry(IEntryHandler entryHandler, IEntry entry)
     {
         if (entry is FreakyEntry freakyEntry && entryHandler is FreakyEntryHandler freakyEntryHandler)
-        {
-            if (freakyEntry.ImageSource != default(ImageSource))
-            {
-                freakyEntryHandler.HandleAndAlignImageSourceAsync(freakyEntry).RunConcurrently();
-            }
-            HandleAllowCopyPaste(freakyEntry);
-        }
+        {
+            if (PlatformView != null && VirtualView != null)
+            {
+                if (freakyEntry.ImageSource != default(ImageSource))
+                {
+                    freakyEntryHandler.HandleAndAlignImageSourceAsync(freakyEntry).RunConcurrently();
+                }
+                HandleAllowCopyPaste(freakyEntry);
+            }
+        }
     }
 }
 
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyPicker/FreakyPickerHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyPicker/FreakyPickerHandler.cs
index 4cc90952..ed7ac949 100644
--- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyPicker/FreakyPickerHandler.cs
+++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyPicker/FreakyPickerHandler.cs
@@ -18,9 +18,12 @@ private void MapPicker(IPickerHandler pickerHandler, IPicker picker)
         if (picker is FreakyPicker freakyTimePicker &&
                            pickerHandler is FreakyPickerHandler freakyTimePickerHandler)
         {
-            if (freakyTimePicker.ImageSource != default(ImageSource))
+            if (PlatformView != null && VirtualView != null)
             {
-                freakyTimePickerHandler.HandleAndAlignImageSourceAsync(freakyTimePicker).RunConcurrently();
+                if (freakyTimePicker.ImageSource != default(ImageSource))
+                {
+                    freakyTimePickerHandler.HandleAndAlignImageSourceAsync(freakyTimePicker).RunConcurrently();
+                }
             }
         }
     }
diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs
index edfe586d..d2655dde 100644
--- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs
+++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyTimePicker/FreakyTimePickerHandler.cs
@@ -15,11 +15,14 @@ private void MapTimePicker(ITimePickerHandler timePickerHandler, ITimePicker tim
     {
         if (timePicker is FreakyTimePicker freakyTimePicker &&
                     timePickerHandler is FreakyTimePickerHandler freakyTimePickerHandler)
-        {
-            if (freakyTimePicker.ImageSource != default(ImageSource))
-            {
-                freakyTimePickerHandler.HandleAndAlignImageSourceAsync(freakyTimePicker).RunConcurrently();
-            }
+        {
+            if (PlatformView != null && VirtualView != null)
+            {
+                if (freakyTimePicker.ImageSource != default(ImageSource))
+                {
+                    freakyTimePickerHandler.HandleAndAlignImageSourceAsync(freakyTimePicker).RunConcurrently();
+                }
+            }
         }
     }
 }