Osng 506

This pull request contains the changes and new error- and success-message.