nil customer fixes