Cosmetic wraps
* Better error handling to be able to get more information about: Failed to send the payload file, error: "maximum recursion depth exceeded in cmp". #462
* Cosmetic