Feature/remove exceptions from flow