Commented asserts in code and added conditional to the rpc thread message