a more fixes and try/except