Added exception handling on await calls