diff --git a/src/AtticaManager.h b/src/AtticaManager.h
index 2399d58b1..91620d2a0 100644
--- a/src/AtticaManager.h
+++ b/src/AtticaManager.h
@@ -54,9 +54,15 @@ public:
     }
 
     explicit AtticaManager ( QObject* parent = 0 );
+#ifdef LIBATTICA_FOUND
+
     virtual ~AtticaManager();
+#else
+    virtual ~AtticaManager() {}
+#endif
 
 #ifdef LIBATTICA_FOUND
+
     bool resolversLoaded() const;
 
     Attica::Content::List resolvers() const;
@@ -83,6 +89,7 @@ private slots:
 
     void loadPixmapsFromCache();
     void savePixmapsToCache();
+    void resolverIconFetched();
 
 private:
     QString extractPayload( const QString& filename, const QString& resolverId ) const;
@@ -99,8 +106,6 @@ private:
 #endif
 
     static AtticaManager* s_instance;
-    public slots:
-     void resolverIconFetched();
 };
 
 #endif // ATTICAMANAGER_H
diff --git a/src/resolversmodel.cpp b/src/resolversmodel.cpp
index 5e7e2fde2..8c2301e00 100644
--- a/src/resolversmodel.cpp
+++ b/src/resolversmodel.cpp
@@ -23,6 +23,7 @@
 #include "tomahawksettings.h"
 #include "tomahawkapp.h"
 #include "resolver.h"
+#include "config.h"
 
 #include "utils/logger.h"
 
@@ -138,6 +139,7 @@ ResolversModel::addResolver( const QString& resolver, bool enable )
 void
 ResolversModel::atticaResolverInstalled( const QString& resolverId )
 {
+#ifdef LIBATTICA_FOUND
     Tomahawk::ExternalResolver* r = APP->resolverForPath( AtticaManager::instance()->pathFromId( resolverId ) );
     if ( !r )
         return;
@@ -147,6 +149,7 @@ ResolversModel::atticaResolverInstalled( const QString& resolverId )
         beginInsertRows( QModelIndex(), idx, idx );
         endInsertRows();
     }
+#endif
 }
 
 
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 34b3d13ff..299b4a0dd 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -542,7 +542,9 @@ SettingsDialog::removeScriptResolver()
     if( !ui->scriptList->selectionModel()->selectedIndexes().isEmpty() )
     {
         QString resolver = ui->scriptList->selectionModel()->selectedIndexes().first().data( ResolversModel::ResolverPath ).toString();
+#ifdef LIBATTICA_FOUND
         AtticaManager::instance()->uninstallResolver( resolver );
+#endif
         m_resolversModel->removeResolver( resolver );
     }
 }