Changed error checks
Updated error checking
Small change
clean up my updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	error.log