Merge "Add addtional logging and catch exceptions"