Better exception handling with more options, current domain is now available over core
Merge remote-tracking branch 'origin/master'