Remove flash when (un-)watching work package, add better error handling