Added another temporary error check