Fix: Handle errors in joined promises