Fix issue with nil customer