MRA: Fixed last commit when unit was null it crashed.