FIX: [droid] consistent splash error handling

Forgotten bits; supersedes #5929 

@BMc08GT Could you confirm it's ok, please.
/cc @MartijnKaijser @topfs2 
Only need to call finish()