Fixed BZ#1101076 - Builder is throwing an NPE.