Fix Major Sonar violation: Hidden Field
Fix Sonar Major violation: Illegal Catch