Brind Android error return values in line with iOS