Shorten try block

Moved building data to outside try block as there was no need for it to be in
there and could have caused an unintended exception to be caught
Stop timeouts due to long requests