Fixed NPE caused from misplaced drug check.