Added error msg and misc files clean-up