Fix for crashing clients on uploads