Draft: Small code fixes and avoiding throwing errors

Merge request reports

Loading