Removed /* catch