Remove Exception throwing