BISERVER-9039 - Added checks for undefined indicatorId param