More metadata gathering and exception handling.