Fixed error over-reporting and the assertions which were supposed to catch it in the first place.