diff --git a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
index 2131dd113c..94c9d09a41 100644
--- a/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/full_screen_dialog_demo.dart
@@ -51,7 +51,8 @@ class DateTimeItem extends StatelessWidget {
                     lastDate: date.add(const Duration(days: 30))
                   )
                   .then<Null>((DateTime value) {
-                    onChanged(new DateTime(value.year, value.month, value.day, time.hour, time.minute));
+                    if (value != null)
+                      onChanged(new DateTime(value.year, value.month, value.day, time.hour, time.minute));
                   });
                 },
                 child: new Row(
@@ -77,7 +78,8 @@ class DateTimeItem extends StatelessWidget {
                   initialTime: time
                 )
                 .then<Null>((TimeOfDay value) {
-                  onChanged(new DateTime(date.year, date.month, date.day, value.hour, value.minute));
+                  if (value != null)
+                    onChanged(new DateTime(date.year, date.month, date.day, value.hour, value.minute));
                 });
               },
               child: new Row(