updated changelog, fixed original error catching and added additional test