Added detection for null or falsey object values