Switched error messages to proper stop or warning calls