diff --git a/gui/src/avopenglwidget.cpp b/gui/src/avopenglwidget.cpp
index 434d77d..38622b9 100644
--- a/gui/src/avopenglwidget.cpp
+++ b/gui/src/avopenglwidget.cpp
@@ -99,9 +99,12 @@ AVOpenGLWidget::AVOpenGLWidget(VideoDecoder *decoder, QWidget *parent)
 
 AVOpenGLWidget::~AVOpenGLWidget()
 {
-	frame_uploader_thread->quit();
-	frame_uploader_thread->wait();
-	delete frame_uploader_thread;
+	if(frame_uploader_thread)
+	{
+		frame_uploader_thread->quit();
+		frame_uploader_thread->wait();
+		delete frame_uploader_thread;
+	}
 	delete frame_uploader;
 	delete frame_uploader_context;
 }