diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart
index e4acceff..7a99fff2 100644
--- a/lib/widget/part_detail.dart
+++ b/lib/widget/part_detail.dart
@@ -133,7 +133,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
     );
 
     // Category information
-    if (part.categoryName.isNotEmpty) {
+    if (part.categoryName != null && part.categoryName.isNotEmpty) {
       tiles.add(
         ListTile(
             title: Text("Part Category"),
@@ -149,6 +149,14 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
             },
           )
       );
+    } else {
+      tiles.add(
+        ListTile(
+          title: Text("Part Category"),
+          subtitle: Text("No category set"),
+          leading: FaIcon(FontAwesomeIcons.stream),
+        )
+      );
     }
 
     // External link?