Extra nil catches for staging