Fixed NPE when requesting block without definitions. Creates a default block definition instead of returning null