Remove need for checking the '\0' from the bootloader