Add some exception handling.
Revise log.