Error Checking Standards 1
tmp
Merge branch 'master' into Error-Checking-Update
Error checking standardization