Removed try except logic