Catch error
Add timeout
Fix syntax error
Minor updates