Concurrent: Strict error check
Concurrent: Fix comments