Merge "Move violation extra messages into throwable"