Removed check for status, this is and should be done elsewhere