Try to make submission more error-robust