fixed crash, more timeout and logs on error