Replaced generic except clause