Fix up no found errors
Clean up the optional api for the get