Error handling fix
Args: multiple fixes