add exception
Merge remote-tracking branch 'VisualCenter/master'