Package renaming and restructuring
Corrected sonar top violations
Use defensive copying to store array
Log exceptions
Remove logging for known null value