Also cleaned up the error message when allocating over the number of slots available. This commit was SVN r7715.