diff --git a/src/openmap/com/bbn/openmap/layer/link/LinkLayer.java b/src/openmap/com/bbn/openmap/layer/link/LinkLayer.java
index afe77c37..32df9818 100644
--- a/src/openmap/com/bbn/openmap/layer/link/LinkLayer.java
+++ b/src/openmap/com/bbn/openmap/layer/link/LinkLayer.java
@@ -237,7 +237,16 @@ public synchronized void setGraphicList(LinkOMGraphicList aList) {
      * Retrieves the current graphics list.
      */
     public synchronized LinkOMGraphicList getGraphicList() {
-        return (LinkOMGraphicList) getList();
+        try {
+            return (LinkOMGraphicList) getList();
+        }
+        catch (ClassCastException e) {
+            if (Debug.debugging("link"))
+            {
+                Debug.output("OMGraphicHandlerLayer does not currently have a LinkOMGraphicList.");
+            }
+            return null;
+        }
     }
 
     /**