Make mocked types work a little bit better
More granual error handling