Catching more Exceptions

Signed-off-by: Sergio Castelani <sergio.castelani@gmail.com>