small fixes for error handling for watch and in browser