Small change to move status messages to caller.