[master] Better error checking
[master] Added a background thread