add null check since default params aren't triggered by null values
add null check since default params aren't triggered by null values

zya6yu/ui,mdiller/ui,odota/ui,coreymaher/ui,mdiller/ui,coreymaher/ui,zya6yu/ui,odota/ui,odota/ui,mdiller/ui,zya6yu/ui