diff --git a/ground/src/libs/opmapcontrol/src/core/opmaps.cpp b/ground/src/libs/opmapcontrol/src/core/opmaps.cpp
index 36f82ddc4..0e4c6ccf9 100644
--- a/ground/src/libs/opmapcontrol/src/core/opmaps.cpp
+++ b/ground/src/libs/opmapcontrol/src/core/opmaps.cpp
@@ -193,15 +193,15 @@ namespace core {
                 qDebug()<<"Starting get response ";//<<pos.X()+","+pos.Y();
 #endif //DEBUG_GMAPS
                 QTime time;
-                time.start();
-                while( !(reply->isFinished() || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);}
+                time.restart();
+                while( !(reply->isFinished() || (time.elapsed()>(Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);}
 #ifdef DEBUG_TIMINGS
                 qDebug()<<"Network time:"<<time.elapsed();
 #endif
 #ifdef DEBUG_GMAPS
-                qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout*6);
+                qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout);
 #endif //DEBUG_GMAPS
-                if( (reply->error()!=QNetworkReply::NoError) || (time.elapsed()>Timeout*6))
+                if( (reply->error()!=QNetworkReply::NoError) || (time.elapsed()>Timeout))
                 {
 #ifdef DEBUG_GMAPS
                     qDebug()<<"Request timed out ";//<<pos.x+","+pos.y;
diff --git a/ground/src/libs/opmapcontrol/src/core/pureimagecache.cpp b/ground/src/libs/opmapcontrol/src/core/pureimagecache.cpp
index a6a47b9a3..56f8827bc 100644
--- a/ground/src/libs/opmapcontrol/src/core/pureimagecache.cpp
+++ b/ground/src/libs/opmapcontrol/src/core/pureimagecache.cpp
@@ -242,7 +242,11 @@ QByteArray PureImageCache::GetImageFromCache(MapType::Types type, Point pos, int
                     QSqlQuery query(cn);
                     query.exec(QString("SELECT Tile FROM TilesData WHERE id = (SELECT id FROM Tiles WHERE X=%1 AND Y=%2 AND Zoom=%3 AND Type=%4)").arg(pos.X()).arg(pos.Y()).arg(zoom).arg((int) type));
                     query.next();
-                    ar=query.value(0).toByteArray();
+                    if(query.isValid())
+                    {
+
+                        ar=query.value(0).toByteArray();
+                    }
                 }
 
                 cn.close();