#240 Added fallback message for step plus an e2e test.