Checking for null. and removed "add button" for value sets.
Merge remote-tracking branch 'choose_remote_name/master'