Add more checks to the raet client