#gh-35 Fixed Exception Critical