Should have just been using False, but added check for "None". Closes