Disconnect better error message & faster simulation