minor edits on homepage.
improve error handling by dying and then catching the exception.