diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp
index 96562404f8..6fad01b70b 100644
--- a/src/qt/choice.cpp
+++ b/src/qt/choice.cpp
@@ -74,7 +74,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
         const wxValidator& validator,
         const wxString& name )
 {
-    return Create( parent, id, pos, size, choices.size(), &choices[ 0 ], style,
+    return Create( parent, id, pos, size, choices.size(), choices.size() ? &choices[ 0 ] : NULL, style,
         validator, name );
 }
 
diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
index d1996b553f..f8ae9e3f54 100644
--- a/src/qt/dc.cpp
+++ b/src/qt/dc.cpp
@@ -24,6 +24,8 @@
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/utils.h"
 
+#include <QtGui/QScreen>
+#include <QtWidgets/QApplication>
 
 static void SetPenColour( QPainter *qtPainter, QColor col )
 {
@@ -124,7 +126,10 @@ int wxQtDCImpl::GetDepth() const
 
 wxSize wxQtDCImpl::GetPPI() const
 {
-    return wxSize(m_qtPainter->device()->logicalDpiX(), m_qtPainter->device()->logicalDpiY());
+    QScreen *srn = QApplication::screens().at(0);
+    qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
+    return wxSize(round(dotsPerInch), round(dotsPerInch));
+//    return wxSize(m_qtPainter->device()->logicalDpiX(), m_qtPainter->device()->logicalDpiY());
 }
 
 void wxQtDCImpl::SetFont(const wxFont& font)
diff --git a/src/qt/evtloop.cpp b/src/qt/evtloop.cpp
index 87561e347d..853dd6e7b3 100644
--- a/src/qt/evtloop.cpp
+++ b/src/qt/evtloop.cpp
@@ -115,7 +115,9 @@ int wxQtEventLoopBase::DispatchTimeout(unsigned long timeout)
 
 void wxQtEventLoopBase::WakeUp()
 {
-    QAbstractEventDispatcher::instance()->wakeUp();
+    QAbstractEventDispatcher *instance = QAbstractEventDispatcher::instance();
+    if(instance)
+        instance->wakeUp();
 }
 
 void wxQtEventLoopBase::DoYieldFor(long eventsToProcess)
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index 6c59620127..57695a1ef2 100644
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -562,9 +562,8 @@ void wxWindowQt::SetScrollbar( int orientation, int pos, int thumbvisible, int r
 void wxWindowQt::SetScrollPos( int orientation, int pos, bool WXUNUSED( refresh ))
 {
     wxScrollBar *scrollBar = QtGetScrollBar( orientation );
-    wxCHECK_RET( scrollBar, "Invalid scrollbar" );
-
-    scrollBar->SetThumbPosition( pos );
+    if(scrollBar)
+        scrollBar->SetThumbPosition( pos );
 }
 
 int wxWindowQt::GetScrollPos( int orientation ) const