Revert "Fix: No need to check for null in getOrElse"

This reverts commit 55f97f12180949393704392bc5fd28d69a31d8e8.
Fix: Check supplier return values for null