Added some additional checks to make sure that the correct methods are being used...