Refactor/more descriptive warning message