Closes #71 Null check on base URL. Related to #57