[master] Fixed invalid source exceptions
[master] Exception classes