Complete basic error handling, start implementing watch removal