Remove redundant check for non-messages