few more dognails for fixing different exceptions on shitty china phones