Increased logging and exception handling.