fixed some null pointer errors in Building and in Drill