Fix issue where full status call wasn't being caught