Replace general raise Exception and add missing raise keyword

Replace general raise Exception and add missing raise keyword #6824