Add logic to .all to avoid exceptions