Added graceful handling for stderr case
Taking care of completed TODOs