diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index 9fc7be59d..198f2ebe1 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -23,6 +23,7 @@
 
 EncryptWidget::EncryptWidget( QWidget* parent )
     : QWidget( parent )
+    , m_state( EncryptionDisabled )
 {
     setupUi( this );
 
diff --git a/src/modules/welcome/checker/partman_devices.c b/src/modules/welcome/checker/partman_devices.c
index d417f3c0f..e2c2bb98f 100644
--- a/src/modules/welcome/checker/partman_devices.c
+++ b/src/modules/welcome/checker/partman_devices.c
@@ -112,7 +112,7 @@ process_device(PedDevice *dev)
 int
 check_big_enough(long long required_space)
 {
-    PedDevice *dev;
+    PedDevice *dev = NULL;
     ped_exception_fetch_all();
     ped_device_probe_all();