Work
Updated error handling needed for android