Better error handling

or by a hydrater