diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt
index aae2df5379..7d510d2510 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt
@@ -106,7 +106,7 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                             val result = WorkerParamsFactory.fromData<UploadAvatarWorker.OutputParams>(info.outputData)
                             cancelableBag.add(
                                     setAvatarUrlTask
-                                            .configureWith(SetAvatarUrlTask.Params(userId = userId, newAvatarUrl = result?.imageUrl!!)) {
+                                            .configureWith(SetAvatarUrlTask.Params(userId = userId, newAvatarUrl = result!!.imageUrl!!)) {
                                                 callback = matrixCallback
                                             }
                                             .executeBy(taskExecutor)
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
index 791b0e20f5..c344d7bf2f 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
@@ -484,9 +484,9 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment(), AvatarSelect
         })
     }
 
-// ==============================================================================================================
-// contacts management
-// ==============================================================================================================
+    // ==============================================================================================================
+    // contacts management
+    // ==============================================================================================================
 
     private fun setContactsPreferences() {
         /* TODO
@@ -519,9 +519,9 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment(), AvatarSelect
         */
     }
 
-// ==============================================================================================================
-// Phone number management
-// ==============================================================================================================
+    // ==============================================================================================================
+    // Phone number management
+    // ==============================================================================================================
 
     /**
      * Refresh phone number list