Fix: No need to check for null in getOrElse