Internal Exception fix