AWESOME: Fix NPE