Account for nullables