Check for null listener
Moved check for builder null in other if cause its the only place it can be null... wooooo
Merge pull request #15 from joshdholtz/check-for-null-listener

Check for null listener