[BUGFIX] Notice and error moved