Fixed #2 - NPE when requesting non-existing object. Thanks to ylorenza for reporting this