Fix placement of failure_message blocks
Merge pull request #253 from maxlinc/failure_message_fix

Fix placement of failure_message blocks