Fix null reference bugs and improve exception handling#8

Claude wants to merge 3 commits into

mainxasx/Collox:mainfrom

claude/check-code-for-bugsxasx/Collox:claude/check-code-for-bugsCopy head branch name to clipboard