Revert "Error Fixes"

This reverts commit b83bfe607ab6ea3dfcf1361ff73770a800252f7f.