Index: matrix/api-impl/src/java/org/theospi/portfolio/matrix/HibernateMatrixManagerImpl.java
===================================================================
--- matrix/api-impl/src/java/org/theospi/portfolio/matrix/HibernateMatrixManagerImpl.java	(revision 106235)
+++ matrix/api-impl/src/java/org/theospi/portfolio/matrix/HibernateMatrixManagerImpl.java	(working copy)
@@ -4193,6 +4193,9 @@
 	
 	public Map getConfirmFlagsForScaffoldingCell(ScaffoldingCell scaffoldingCell){
 		Map model = new HashMap();
+		if (scaffoldingCell.getScaffolding() == null) {
+			return model;
+		}
 		//if scaffolding is published, warn user;    
 		if (scaffoldingCell.getScaffolding().isPublished()){
 			model.put(CONFIRM_PUBLISHED_FLAG, true);