#2 #3 error handling and change task name

#2 #3 Fix!