Fix type cast problems now that watch can pass errors

@thockin