Removed temporary error checking