diff --git a/packages/flutter/lib/src/painting/text_painter.dart b/packages/flutter/lib/src/painting/text_painter.dart
index 9f14bd85803..f53ea53cb82 100644
--- a/packages/flutter/lib/src/painting/text_painter.dart
+++ b/packages/flutter/lib/src/painting/text_painter.dart
@@ -116,8 +116,9 @@ class TextSpan {
     buffer.writeln(style.toString(indent));
     if (text != null)
       buffer.writeln('$indent"$text"');
-    for (TextSpan child in children)
-      buffer.writeln(child.toString(indent));
+    if (children != null)
+      for (TextSpan child in children)
+        buffer.writeln(child.toString(indent));
     return buffer.toString();
   }
 
diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart
index 68d4eee987a..03e9c86c1e7 100644
--- a/packages/flutter/lib/src/widgets/gesture_detector.dart
+++ b/packages/flutter/lib/src/widgets/gesture_detector.dart
@@ -340,7 +340,7 @@ class RawGestureDetectorState extends State<RawGestureDetector> {
     if (_recognizers == null) {
       description.add('DISPOSED');
     } else {
-      List<String> gestures = _recognizers.values.map/*<String>*/((GestureRecognizer recognizer) => recognizer.toStringShort());
+      List<String> gestures = _recognizers.values.map/*<String>*/((GestureRecognizer recognizer) => recognizer.toStringShort()).toList();
       if (gestures.isEmpty)
         gestures.add('<none>');
       description.add('gestures: ${gestures.join(", ")}');