Changed a throws handling