Fixes #332, #327 and remove model facade

Hmm ok I'll rethrow the exception