Add temporary message for failures
Remove duplicate subroutine definition
Non-functional change