Updating to catch exceptions thrown by function calls in code, updating comments