Merge "Add more information to BuildErrorException"