Update to Guardian API + error handling