Merge branch 'Remove-ErrorChecks'