Better error handling in bootstrapper
Removing unused reference