Fix nil behavior