diff --git a/epan/proto.h b/epan/proto.h
index ccb8c4176c..d6710e40b8 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
 /* proto.h
  * Definitions for protocol display
  *
- * $Id: proto.h,v 1.59 2004/05/01 15:15:08 ulfl Exp $
+ * $Id: proto.h,v 1.60 2004/05/01 18:39:07 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -156,11 +156,11 @@ typedef proto_node proto_item;
 
 
 /* indicate that this field should not be shown by Ethereal (used for filtering only) */
-#define PROTO_ITEM_IS_HIDDEN(proto_item)        FI_GET_FLAG(proto_item->finfo, FI_HIDDEN)
-#define PROTO_ITEM_SET_HIDDEN(proto_item)       FI_SET_FLAG(proto_item->finfo, FI_HIDDEN)
+#define PROTO_ITEM_IS_HIDDEN(proto_item)        if(proto_item) FI_GET_FLAG(proto_item->finfo, FI_HIDDEN)
+#define PROTO_ITEM_SET_HIDDEN(proto_item)       if(proto_item) FI_SET_FLAG(proto_item->finfo, FI_HIDDEN)
 /* indicate that this field is generated by Ethereal (and not inside the packet data) */
-#define PROTO_ITEM_IS_GENERATED(proto_item)     FI_GET_FLAG(proto_item->finfo, FI_GENERATED)
-#define PROTO_ITEM_SET_GENERATED(proto_item)    FI_SET_FLAG(proto_item->finfo, FI_GENERATED)
+#define PROTO_ITEM_IS_GENERATED(proto_item)     if(proto_item) FI_GET_FLAG(proto_item->finfo, FI_GENERATED)
+#define PROTO_ITEM_SET_GENERATED(proto_item)    if(proto_item) FI_SET_FLAG(proto_item->finfo, FI_GENERATED)
 
 
 typedef void (*proto_tree_foreach_func)(proto_node *, gpointer);