APF-1395: Fixed NPE when running AMP from the command line