Minor Changes

- Made some minor code fixes to the new entry to handle if the location
can not be retrieved