Merge "Revision: test and fix __construct exceptions"