Fixed bug, no more try and except