Add proper exception type