Merge "registration: Notify of problems before filemtime, not after"