Fix if/else to switch to handle null scenarios (#1726)

Fix if/else to switch to handle null scenarios (#1726) #978