diff --git a/WordPress/src/main/java/org/wordpress/android/ui/LayoutBehaviors.kt b/WordPress/src/main/java/org/wordpress/android/ui/LayoutBehaviors.kt
index 25f85428ad60..1dce1d974194 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/LayoutBehaviors.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/LayoutBehaviors.kt
@@ -25,9 +25,9 @@ class WPTooltipViewBehavior : CoordinatorLayout.Behavior<WPTooltipView> {
     }
 
     override fun onDependentViewChanged(parent: CoordinatorLayout, child: WPTooltipView, dependency: View): Boolean {
-        if (child.position != ABOVE) {
+        require(child.position == ABOVE) {
             // Remove this condition if you want to support different TooltipPosition
-            throw IllegalArgumentException("This behavior only supports TooltipPosition.ABOVE")
+            "This behavior only supports TooltipPosition.ABOVE"
         }
 
         if (dependency.measuredWidth == 0 || child.measuredWidth == 0) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
index 36c3c42ae68f..c891e2d8b35d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
@@ -70,19 +70,16 @@ class StatsViewAllViewModelFactory(
     @StringRes private val titleResource: Int
 ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        if (modelClass.isAssignableFrom(StatsViewAllViewModel::class.java)) {
-            @Suppress("UNCHECKED_CAST")
-            return StatsViewAllViewModel(
-                mainDispatcher,
-                bgDispatcher,
-                useCase,
-                statsSiteProvider,
-                dateSelector,
-                titleResource
-            ) as T
-        } else {
-            throw IllegalArgumentException("ViewModel Not Found")
-        }
+        require(!modelClass.isAssignableFrom(StatsViewAllViewModel::class.java)) { "ViewModel Not Found" }
+        @Suppress("UNCHECKED_CAST")
+        return StatsViewAllViewModel(
+            mainDispatcher,
+            bgDispatcher,
+            useCase,
+            statsSiteProvider,
+            dateSelector,
+            titleResource
+        ) as T
     }
 
     class Builder @Inject constructor(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt
index 708b70cf5b9c..907eb9c94196 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/AutoSavePostIfNotDraftUseCase.kt
@@ -80,16 +80,13 @@ class AutoSavePostIfNotDraftUseCase @Inject constructor(
         callback: OnAutoSavePostIfNotDraftCallback
     ) {
         val remotePostId = RemoteId(remotePostPayload.post.remotePostId)
-        if (remotePostPayload.post.isLocalDraft) {
-            throw IllegalArgumentException("Local drafts should not be auto-saved")
-        }
-        if (postStatusContinuations.containsKey(remotePostId) ||
-            autoSaveContinuations.containsKey(remotePostId)
+        require(!remotePostPayload.post.isLocalDraft) { "Local drafts should not be auto-saved" }
+        require(
+            !postStatusContinuations.containsKey(remotePostId) && !autoSaveContinuations.containsKey(remotePostId)
         ) {
-            throw IllegalArgumentException(
-                "This post is already being processed. Make sure not to start an autoSave " +
-                        "or update draft action while another one is going on."
-            )
+            "This post is already being processed. Make sure not to start an autoSave " +
+                    "or update draft action while another one is going on."
+
         }
         coroutineScope.launch {
             val onPostStatusFetched = fetchRemotePostStatus(remotePostPayload)