Android; updated to 2.5 support, better error handling