Jbau upload robustness

this should address some of #1637 and all of #1926 

@dcadams