Refactoring of errorhandling for fact availability check. #6