removed unnecessary parsing & exception throwing