diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
index 2178d43..679f583 100644
--- a/limereport/lrpagedesignintf.cpp
+++ b/limereport/lrpagedesignintf.cpp
@@ -2169,7 +2169,7 @@ void PropertyItemAlignChangedCommand::undoIt()
     if (reportItem && (reportItem->property(m_propertyName.toLatin1()) != m_oldValue)) {
         reportItem->setProperty(m_propertyName.toLatin1(), m_oldValue);
     }
-    if (m_oldValue == BaseDesignIntf::DesignedItemAlign){
+    if (reportItem && (m_oldValue == BaseDesignIntf::DesignedItemAlign)){
         reportItem->setPos(m_savedPos);
     }
 }
diff --git a/limereport/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp
index 6a6ff0c..4852b97 100644
--- a/limereport/lrreportdesignwidget.cpp
+++ b/limereport/lrreportdesignwidget.cpp
@@ -74,7 +74,7 @@ ReportDesignWidget::ReportDesignWidget(ReportEnginePrivate *report, QMainWindow
     connect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabChanged(int)));
 
     //m_instance=this;
-    m_scriptEditor->setPlainText(report->scriptContext()->initScript());
+    m_scriptEditor->setPlainText(m_report->scriptContext()->initScript());
     m_zoomer = new GraphicsViewZoomer(activeView());
 #ifdef Q_OS_WIN
     m_defaultFont = QFont("Arial",10);
diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index 8d2ccb6..f1a40bd 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -481,9 +481,12 @@ BandDesignIntf* ReportRender::renderBand(BandDesignIntf *patternBand, BandDesign
 
 void ReportRender::renderDataBand(BandDesignIntf *dataBand)
 {
+    if (dataBand == NULL )
+        return;
+
     IDataSource* bandDatasource = 0;
     m_lastRenderedFooter = 0;
-    if (dataBand && !dataBand->datasourceName().isEmpty())
+    if (!dataBand->datasourceName().isEmpty())
        bandDatasource = datasources()->dataSource(dataBand->datasourceName());
 
     BandDesignIntf* header = dataBand->bandHeader();
@@ -691,7 +694,7 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
 //            }
         }
 
-        if (!gb->isStarted()){
+        if (gb && !gb->isStarted()){
             if (band->reprintOnEachPage())
                 m_reprintableBands.append(band);
             gb->startGroup(m_datasources);