Merge "bootctl: check for nullptr" into main