Added temporary error checker