Update deferral file comments and check for/log error condition