diff --git a/app/task/task.cpp b/app/task/task.cpp
index c49ed890f..62adf3742 100644
--- a/app/task/task.cpp
+++ b/app/task/task.cpp
@@ -22,16 +22,39 @@
 
 Task::Task() :
   status_(kWaiting),
-  thread_(this)
+  thread_(this),
+  text_(tr("Task"))
 {
   connect(&thread_, SIGNAL(finished()), this, SLOT(ThreadComplete()));
 }
 
-void Task::Start()
+bool Task::Start()
 {
+  // Check if this task has any dependencies (tasks that should complete before this one starts)
+
+  for (int i=0;i<dependencies_.size();i++) {
+    Task* dependency = dependencies_.at(i);
+
+    if (dependency->status() == kWaiting || dependency->status() == kWorking) {
+
+      // We need this task to finish before this task can start, so keep waiting
+      return false;
+
+    } else if (dependency->status() == kError) {
+
+      // A dependency errored, so this task is likely invalid too
+      set_error(tr("A dependency task failed"));
+      set_status(kError);
+      return false;
+
+    }
+  }
+
   set_status(kWorking);
 
   thread_.start();
+
+  return true;
 }
 
 bool Task::Action()
@@ -44,16 +67,34 @@ const Task::Status &Task::status()
   return status_;
 }
 
+const QString &Task::text()
+{
+  return text_;
+}
+
 const QString &Task::error()
 {
   return error_;
 }
 
-void Task::SetError(const QString &s)
+void Task::AddDependency(Task *dependency)
+{
+  // Dependencies cannot be added if the Task is working or complete
+  Q_ASSERT(status_ == kWaiting);
+
+  dependencies_.append(dependency);
+}
+
+void Task::set_error(const QString &s)
 {
   error_ = s;
 }
 
+void Task::set_text(const QString &s)
+{
+  text_ = s;
+}
+
 void Task::set_status(const Task::Status &status)
 {
   status_ = status;
diff --git a/app/task/task.h b/app/task/task.h
index 89d75b8a9..3d0e1b728 100644
--- a/app/task/task.h
+++ b/app/task/task.h
@@ -38,16 +38,22 @@ public:
 
   Task();
 
-  void Start();
+  bool Start();
 
   virtual bool Action();
 
   const Status& status();
 
+  const QString& text();
+
   const QString& error();
 
+  void AddDependency(Task* dependency);
+
 protected:
-  void SetError(const QString& s);
+  void set_error(const QString& s);
+
+  void set_text(const QString& s);
 
 signals:
   void StatusChanged(Task::Status s);
@@ -59,8 +65,12 @@ private:
 
   TaskThread thread_;
 
+  QString text_;
+
   QString error_;
 
+  QList<Task*> dependencies_;
+
 private slots:
   void ThreadComplete();
 };
diff --git a/app/task/taskmanager.cpp b/app/task/taskmanager.cpp
index 268cb6b1b..ac2c5098d 100644
--- a/app/task/taskmanager.cpp
+++ b/app/task/taskmanager.cpp
@@ -54,9 +54,12 @@ void TaskManager::StartNextWaiting()
       // Task is active, add it to the count
       working_count++;
     } else if (t->status() == Task::kWaiting) {
-      // Task is waiting and we have available threads, start it and add it to the count
-      t->Start();
-      working_count++;
+
+      // Task is waiting and we have available threads, try to start it
+      if (t->Start()) {
+        // If it started correctly, add it to the working count
+        working_count++;
+      }
     }
 
     // Check if the count exceeds our maximum threads, if so stop here