Added error messages, removed empty files