diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/PostUploader.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/PostUploader.java
index c0e00d6..7076169 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/PostUploader.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/PostUploader.java
@@ -45,6 +45,7 @@ public class PostUploader extends UploadClass {
             @Override
             public void onFailure(@NonNull Exception e) {
                 Log.d(TAG, "onFailure: Upload Failed");
+                mListener.PostUploadComplete(false);
             }
         })
                 .addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@@ -66,8 +67,11 @@ public class PostUploader extends UploadClass {
                     public void onComplete(@NonNull Task<Void> task) {
                         if (task.isSuccessful()) {
                             Log.d(TAG, "onComplete: Added post to database");
+                            mListener.PostUploadComplete(true);
                         } else {
                             Log.d(TAG, "onComplete: " + task.getException().getLocalizedMessage());
+                            mListener.PostUploadComplete(false);
+
                         }
                     }
                 });
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java
index 0668936..1137d5d 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java
@@ -7,6 +7,7 @@ import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.UserProfileChangeRequest;
@@ -48,6 +49,12 @@ public class ProfilePictureUploader extends UploadClass {
                 Uri downloadUrl = taskSnapshot.getDownloadUrl();
                 updateProfilePictureInUser(downloadUrl);
             }
+        })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        mListener.ProfilePictureUpdated(false);
+                    }
         });
     }