Merge "Improve error message on exception raised by get_default"