diff --git a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
index 43218b0..7d290ad 100644
--- a/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
+++ b/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
@@ -63,7 +63,14 @@
                 for ( ISigilProjectModel n : models )
                 {
                     ISigilBundle b = n.getBundle();
-                    tmp.add( b );
+                    if ( b == null )
+                    {
+                        SigilCore.error( "No bundle found for project " + n.getProject().getName() );
+                    }
+                    else
+                    {
+                        tmp.add( b );
+                    }
                 }
                 bundles = tmp.toArray( new ISigilBundle[tmp.size()] );
             }