Fixed bug with no api message