updated
need to throw an error unless get() returns
fixed merge