Error message handling WIP
Remove spurious call