Fix core exception issue