| Index: pkg/analysis_server/lib/src/context_manager.dart
|
| diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
|
| index 723c9c7d069b5c06c9c1711c971f5b87e2e164f3..9fc4c16d1cdb1ce38b0f4ae65b3c5ccbb02fac71 100644
|
| --- a/pkg/analysis_server/lib/src/context_manager.dart
|
| +++ b/pkg/analysis_server/lib/src/context_manager.dart
|
| @@ -437,7 +437,7 @@ class ContextManagerImpl implements ContextManager {
|
| */
|
| ContextInfo getContextInfoFor(Folder folder) {
|
| ContextInfo info = _getInnermostContextInfoFor(folder.path);
|
| - if (folder == info.folder) {
|
| + if (info != null && folder == info.folder) {
|
| return info;
|
| }
|
| return null;
|
|
|