Fix for PR

Added Error-Message and Error-Code