diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java index 402ed2cad..31937bfd9 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java @@ -79,7 +79,7 @@ public String getTooltip() { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return mTooltipText; else - return getTooltipText().toString(); + return getTooltipText() == null ? null : getTooltipText().toString(); } @TargetApi(Build.VERSION_CODES.O)