Put in Some Extra Checks to Stop Failure