exception update
Merge commit 'fa3c2af'