Catch right exception now that we no longer eval
Rename getInstance to wrapInstance