Update 2

* Error returning when query is returning null (FIXED)