re-enable android support with minor improv (specify keyerror)