adding error and removing faltu code