[FEATURE] Starting to add additional information to error message