Merge branch 'issue_2401' into 'v1-oreo'

handle null pointer exception

See merge request e/apps/eDrive!42
1 job for v1-oreo in 6 minutes and 41 seconds (queued for 39 minutes and 59 seconds)