Try moving exception clause
Update logging messages