Error detection

Sorry or the monstruous diff in Framework... I can't figure it out :-(