Add proper ldap error handling
Add late uploader