Refactoring

* Better timeout assignment
* Use namespace on exception raise