another try at safari, but with better error handling