Fix import
More NullPointer catchers!