Use proper exception type