Did small fix to avoid nullPointerException