diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud_cubit_consumer_screen_bases.dart b/packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud_cubit_consumer_screen_bases.dart
index 7090ff17..e3f58686 100644
--- a/packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud_cubit_consumer_screen_bases.dart
+++ b/packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud_cubit_consumer_screen_bases.dart
@@ -27,10 +27,11 @@ abstract class CrudCubitConsumerScreenBase<
   const CrudCubitConsumerScreenBase({super.key});
 
   Widget errorBuilder(BuildContext context, CrudError state) =>
-      context.components.errorWidget.configure(error: state.message);
+      context.components.errorWidget?.configure(error: state.message) ??
+      const SizedBox.shrink();
 
   Widget loadingBuilder(BuildContext context, CrudLoading state) =>
-      context.components.loadingWidget;
+      context.components.loadingWidget ?? const SizedBox.shrink();
 
   Widget initialBuilder(BuildContext context, CrudInitial state) =>
       const SizedBox.shrink();
diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/screens/crud_cubit_screen_base.dart b/packages/wyatt_bloc_layout/lib/src/presentation/screens/crud_cubit_screen_base.dart
index 4240f819..04f35bbf 100644
--- a/packages/wyatt_bloc_layout/lib/src/presentation/screens/crud_cubit_screen_base.dart
+++ b/packages/wyatt_bloc_layout/lib/src/presentation/screens/crud_cubit_screen_base.dart
@@ -16,17 +16,17 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
-import 'package:wyatt_bloc_helper/wyatt_bloc_helper.dart';
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
 abstract class CrudCubitScreenBase<Cubit extends bloc_base.Cubit<CrudState>,
     SuccessState extends CrudSuccess> extends CubitScreen<Cubit, CrudState> {
   const CrudCubitScreenBase();
   Widget errorBuilder(BuildContext context, CrudError state) =>
-      context.components.errorWidget;
+      context.components.errorWidget?.configure(error: state.message) ??
+      const SizedBox.shrink();
 
   Widget loadingBuilder(BuildContext context, CrudLoading state) =>
-      context.components.loadingWidget;
+      context.components.loadingWidget ?? const SizedBox.shrink();
 
   Widget initialBuilder(BuildContext context, CrudInitial state) =>
       const SizedBox.shrink();