Added catch for regular exceptions