Fixed bug where apiService could become null