Changed point query functions and added a catch block for null pointers.
Merge branch 'master' of https://github.com/uberj/Winter2013