fix format errors, clean up first time message, use rethrow