diff --git a/core/Maker/MakeCrudController.php b/core/Maker/MakeCrudController.php
index a90e7c1..d8e3f71 100644
--- a/core/Maker/MakeCrudController.php
+++ b/core/Maker/MakeCrudController.php
@@ -79,7 +79,7 @@ class MakeCrudController extends AbstractMaker
 
         $formDetails = $generator->createClassNameDetails(
             $input->getArgument('form-class'),
-            'Type\\',
+            'Form\\',
             ''
         );
 
diff --git a/core/Resources/views/admin/crud/field/date.html.twig b/core/Resources/views/admin/crud/field/date.html.twig
index 98c34c0..c1daaa0 100644
--- a/core/Resources/views/admin/crud/field/date.html.twig
+++ b/core/Resources/views/admin/crud/field/date.html.twig
@@ -1,4 +1,6 @@
-<span class="btn btn-sm btn-light">
-    <span class="fa fa-calendar-alt text-black-50 mr-1"></span>
-    {{ value|date(options.format) }}
-</span>
+{% if value %}
+    <span class="btn btn-sm btn-light">
+        <span class="fa fa-calendar-alt text-black-50 mr-1"></span>
+        {{ value|date(options.format) }}
+    </span>
+{% endif %}