diff --git a/DevBytesRepository/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt b/DevBytesRepository/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
index 77d91ad..7135f00 100755
--- a/DevBytesRepository/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
+++ b/DevBytesRepository/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
@@ -114,7 +114,7 @@ class DevByteViewModel(application: Application) : AndroidViewModel(application)
 
             } catch (networkError: IOException) {
                 // Show a Toast error message and hide the progress bar.
-                if(playlist.value!!.isEmpty())
+                if(playlist.value.isNullOrEmpty())
                     _eventNetworkError.value = true
             }
         }
diff --git a/DevBytesWorkManager/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt b/DevBytesWorkManager/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
index 77d91ad..7135f00 100755
--- a/DevBytesWorkManager/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
+++ b/DevBytesWorkManager/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
@@ -114,7 +114,7 @@ class DevByteViewModel(application: Application) : AndroidViewModel(application)
 
             } catch (networkError: IOException) {
                 // Show a Toast error message and hide the progress bar.
-                if(playlist.value!!.isEmpty())
+                if(playlist.value.isNullOrEmpty())
                     _eventNetworkError.value = true
             }
         }