Bugfix: FC022
Change: fail more