Added System Err checking
Merge origin/master