#gh-3~54 Fixed Exception Critical