Adds checks for bump in bump handlers