diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4d5c5816..31cd7247 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -56,6 +56,15 @@
       "contributions": [
         "a11y"
       ]
+    },
+    {
+      "login": "arthurdenner",
+      "name": "Arthur Denner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13774309?v=4",
+      "profile": "https://linktr.ee/arthurdenner",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 38f13533..a3aba60f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Flutter Sidekick
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Sidekick is an app that provides a simple desktop interface to tools that enhance Flutter development experience to make it even more delightful.
@@ -35,6 +35,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://technodisaster.wtf"><img src="https://avatars.githubusercontent.com/u/52817235?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jayesh Nirve</b></sub></a><br /><a href="#maintenance-Techno-Disaster" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://youtube.com/c/PaulHalliday"><img src="https://avatars.githubusercontent.com/u/19576417?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Paul Halliday</b></sub></a><br /><a href="https://github.com/leoafarias/sidekick/commits?author=PaulHalliday" title="Code">💻</a> <a href="https://github.com/leoafarias/sidekick/issues?q=author%3APaulHalliday" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anticafe"><img src="https://avatars.githubusercontent.com/u/340836?v=4?s=50" width="50px;" alt=""/><br /><sub><b>anticafe</b></sub></a><br /><a href="#a11y-anticafe" title="Accessibility">️️️️♿️</a></td>
+    <td align="center"><a href="https://linktr.ee/arthurdenner"><img src="https://avatars.githubusercontent.com/u/13774309?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Arthur Denner</b></sub></a><br /><a href="https://github.com/leoafarias/sidekick/issues?q=author%3Aarthurdenner" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 
diff --git a/lib/src/components/organisms/info_drawer.dart b/lib/src/components/organisms/info_drawer.dart
index 41066587..54ae43c0 100644
--- a/lib/src/components/organisms/info_drawer.dart
+++ b/lib/src/components/organisms/info_drawer.dart
@@ -19,8 +19,7 @@ class SelectedDetailDrawer extends HookWidget {
   @override
   Widget build(BuildContext context) {
     final detail = useProvider(selectedDetailProvider).state;
-
-    final selected = detail.release;
+    final selected = detail?.release;
 
     void onClose() {
       // Close drawer if its not large layout
diff --git a/lib/src/modules/common/app_shell.dart b/lib/src/modules/common/app_shell.dart
index b49272ad..0b2457a6 100644
--- a/lib/src/modules/common/app_shell.dart
+++ b/lib/src/modules/common/app_shell.dart
@@ -48,7 +48,7 @@ class AppShell extends HookWidget {
     useValueChanged(selectedInfo, (_, __) {
       if (_scaffoldKey.currentState == null) return;
       final isOpen = _scaffoldKey.currentState.isEndDrawerOpen;
-      final hasInfo = selectedInfo.release != null;
+      final hasInfo = selectedInfo?.release != null;
 
       // Open drawer if not large layout and its not open
       if (hasInfo && !isOpen) {