[Bugfix] Move adding message so it's output in all cases