diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
index 807cfc1aec..91ee56d19d 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/viewmodel/ActionViewModelBase.kt
@@ -30,7 +30,8 @@ abstract class ActionViewModelBase(
             onError = { throwable ->
                 logger.error(LTag.PUMP, "Caught exception in while executing action in ActionViewModelBase", throwable)
                 _isActionExecutingLiveData.postValue(false)
-                _actionResultLiveData.postValue(PumpEnactResult(injector).success(false).comment(throwable.message))
+                _actionResultLiveData.postValue(PumpEnactResult(injector).success(false).comment(
+                    throwable.message ?: "Caught exception in while executing action in ActionViewModelBase"))
             })
     }