Check for null listener
Moved check for builder null in other if cause its the only place it can be null... wooooo
fix uncatch exception automatic report