Added in timeout and catch all exceptions