Patched some missing error handling of id file login