Fix scoping for method calls, added exception handler around include to limit errors to that file

I've made some improvements, if you have any stylistic or other concerns please let me know and i'll amend the request.