Prevent promises from panic'ing
Include the stack as part of the error
Add tests for Instance
Refactor as necessary