Suppress message of code analysis
Update error handling
Refactor
Refactor
Refactor