Clean code
Add missing error report if on monitor fails